Yorke Lee
1186df4315
am 3e460f13
: am 61b82ac4
: am 3066f832
: Merge "Rename default dialer to default phone app" into mnc-dev
...
* commit '3e460f1368c12843d345c28be1233618e7bd8bbd':
Rename default dialer to default phone app
2015-05-05 01:30:24 +00:00
Yorke Lee
3e460f1368
am 61b82ac4
: am 3066f832
: Merge "Rename default dialer to default phone app" into mnc-dev
...
* commit '61b82ac4cb81acdcad6171ea667809ddc0ff36e4':
Rename default dialer to default phone app
2015-05-05 01:17:03 +00:00
Yorke Lee
61b82ac4cb
am 3066f832
: Merge "Rename default dialer to default phone app" into mnc-dev
...
* commit '3066f832435af08bbc2ed5fcef45228d5ff86e33':
Rename default dialer to default phone app
2015-05-05 01:04:15 +00:00
Jason Monk
1c2af85471
am e7c31d34
: am ed1bf50d
: am 0ab13b83
: Merge "Add high power whitelist for apps" into mnc-dev
...
* commit 'e7c31d34d0ac6c0d57bfa29ec1c6acadbf18e0b9':
Add high power whitelist for apps
2015-05-05 01:03:25 +00:00
Yorke Lee
3066f83243
Merge "Rename default dialer to default phone app" into mnc-dev
2015-05-05 00:22:13 +00:00
Jason Monk
e7c31d34d0
am ed1bf50d
: am 0ab13b83
: Merge "Add high power whitelist for apps" into mnc-dev
...
* commit 'ed1bf50d125739938379d57f207fa62817d9bbef':
Add high power whitelist for apps
2015-05-04 19:07:40 +00:00
Jason Monk
ed1bf50d12
am 0ab13b83
: Merge "Add high power whitelist for apps" into mnc-dev
...
* commit '0ab13b8326d6f31caff922fd95828254cb95a618':
Add high power whitelist for apps
2015-05-04 18:59:15 +00:00
Jason Monk
0ab13b8326
Merge "Add high power whitelist for apps" into mnc-dev
2015-05-04 18:50:19 +00:00
Jason Monk
1eb54eb2ff
Add high power whitelist for apps
...
- Strings not final!
- New UX for power usage details (more preferency)
- Add high power apps list shows on/off and screen to
change (when possible)
- Link from power usage summary to high power list
- Link from advanced apps to high power list
Bug: 19991702
Change-Id: I97c927ed82d3b89041e4429b427508545763d66c
2015-05-04 14:38:01 -04:00
Geoff Mendal
3396e14523
am a99b430d
: (-s ours) am 8f32538d
: (-s ours) am 32ba436b
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'a99b430df964ba69484a24a11f050f5607690b44':
Import translations. DO NOT MERGE
2015-05-04 14:35:42 +00:00
Geoff Mendal
a99b430df9
am 8f32538d
: (-s ours) am 32ba436b
: (-s ours) Import translations. DO NOT MERGE
...
* commit '8f32538d8c2d94a93e1e9f09da0ec59ad2749854':
Import translations. DO NOT MERGE
2015-05-04 14:24:46 +00:00
Geoff Mendal
8f32538d8c
am 32ba436b
: (-s ours) Import translations. DO NOT MERGE
...
* commit '32ba436b0b8b955874dd2797a4c317951385fcde':
Import translations. DO NOT MERGE
2015-05-04 14:12:37 +00:00
Geoff Mendal
32ba436b0b
Import translations. DO NOT MERGE
...
Change-Id: I9fa131ac5fdd9b014c319fa72ede5aaca13eb24c
Auto-generated-cl: translation import
2015-05-04 06:18:18 -07:00
Geoff Mendal
3321e72cb2
Import translations. DO NOT MERGE
...
Change-Id: I05ee02c638e4a9152d80b013a97f5e9b84404558
Auto-generated-cl: translation import
2015-05-04 05:47:44 -07:00
Maurice Lam
6b715e4293
am 9e504d5d
: am 8585162b
: am a283e6e3
: Use curly quotes and apostrophes
...
* commit '9e504d5d2fd2333ef52fa7049fa0f60e59637d9c':
Use curly quotes and apostrophes
2015-05-01 21:06:02 +00:00
Maurice Lam
9e504d5d2f
am 8585162b
: am a283e6e3
: Use curly quotes and apostrophes
...
* commit '8585162ba3b0bfea06f297653150d1ad8cba7e6b':
Use curly quotes and apostrophes
2015-05-01 20:58:10 +00:00
Maurice Lam
8585162ba3
am a283e6e3
: Use curly quotes and apostrophes
...
* commit 'a283e6e325aeae794fb04e60c38431721742b622':
Use curly quotes and apostrophes
2015-05-01 20:47:05 +00:00
Maurice Lam
a283e6e325
Use curly quotes and apostrophes
...
Per UX writing style guide, quotes and apostrophes should be curly
https://spec.googleplex.com/live/style/writing.html#writing-global-writing
Bug: 20706978
Change-Id: Idcbb9014c7c04f6f8336a58d2ff5a0ea9409110a
2015-05-01 10:29:05 -07:00
Amit Mahajan
29a2975826
am 2cb2a700
: am 30431a4d
: am 0255f595
: Merge "ApnEditor changes to support bearer as a bitmask." into mnc-dev
...
* commit '2cb2a700cfb6ef5110a47ade840b690b21afe8ab':
ApnEditor changes to support bearer as a bitmask.
2015-05-01 17:14:59 +00:00
Sudheer Shanka
a6b606ec86
am eb1a58aa
: am 2a549b66
: am 0488dc97
: Add MDM app name under "Work" in Accounts section of Settings.
...
* commit 'eb1a58aa337d12a712ed413920a9e8d9ddea68cb':
Add MDM app name under "Work" in Accounts section of Settings.
2015-05-01 17:14:58 +00:00
Amit Mahajan
2cb2a700cf
am 30431a4d
: am 0255f595
: Merge "ApnEditor changes to support bearer as a bitmask." into mnc-dev
...
* commit '30431a4dbd6985014c87e4a8aca5d04761433e9f':
ApnEditor changes to support bearer as a bitmask.
2015-05-01 17:05:19 +00:00
Sudheer Shanka
eb1a58aa33
am 2a549b66
: am 0488dc97
: Add MDM app name under "Work" in Accounts section of Settings.
...
* commit '2a549b66b0af543acf48fabed8e83837e1ea497d':
Add MDM app name under "Work" in Accounts section of Settings.
2015-05-01 17:05:18 +00:00
Amit Mahajan
30431a4dbd
am 0255f595
: Merge "ApnEditor changes to support bearer as a bitmask." into mnc-dev
...
* commit '0255f595bd5ffbf39601296ac708130fccfc02ed':
ApnEditor changes to support bearer as a bitmask.
2015-05-01 16:52:08 +00:00
Sudheer Shanka
2a549b66b0
am 0488dc97
: Add MDM app name under "Work" in Accounts section of Settings.
...
* commit '0488dc97686051d6cac744edb8a9d9c7ec477009':
Add MDM app name under "Work" in Accounts section of Settings.
2015-05-01 16:52:07 +00:00
Amit Mahajan
0255f595bd
Merge "ApnEditor changes to support bearer as a bitmask." into mnc-dev
2015-05-01 16:50:05 +00:00
Sudheer Shanka
0488dc9768
Add MDM app name under "Work" in Accounts section of Settings.
...
Bug: 20024761
Change-Id: I3fe3fd6be8a2d96b36c402ea9bde8cc782797262
2015-05-01 14:42:52 +01:00
Jorim Jaggi
0ca222c3b0
am dd3324fe
: am 6ac9046d
: am e8d8af2b
: Merge "Update fingerprint settings to spec" into mnc-dev
...
* commit 'dd3324fe8a1bcd61046798a1ec21b347a1dd4b07':
Update fingerprint settings to spec
2015-05-01 01:34:44 +00:00
Chris Craik
0220e94fb5
am 5364910f
: am e391e9c2
: am 3401a652
: Merge "Increase clip debug string limit" into mnc-dev
...
* commit '5364910f2a26688548eb310e4643e8f726ea1d27':
Increase clip debug string limit
2015-05-01 01:34:42 +00:00
Fyodor Kupolov
372ecf2f4c
am bcc40fe5
: am da84bf8d
: am 729aa932
: Merge "Fixed an issue with back key behavior" into mnc-dev
...
* commit 'bcc40fe5d1d6f0052221db216a73d54e8e6ba214':
Fixed an issue with back key behavior
2015-05-01 01:34:23 +00:00
Maurice Lam
7971fdb15b
am 688319c6
: am d4933fa1
: am 05a0336b
: [WifiSetup] Use bullets in skip dialog
...
* commit '688319c6efdd2413cddf6534aba308700a1693b7':
[WifiSetup] Use bullets in skip dialog
2015-05-01 01:34:03 +00:00
Amit Mahajan
7e28221640
ApnEditor changes to support bearer as a bitmask.
...
Change-Id: I8d97f7e789a6ab75f2c5931624fe9694589fc215
2015-04-30 18:03:17 -07:00
Jorim Jaggi
dd3324fe8a
am 6ac9046d
: am e8d8af2b
: Merge "Update fingerprint settings to spec" into mnc-dev
...
* commit '6ac9046d84ea736cf7e96da4da6e92dbd1fc624a':
Update fingerprint settings to spec
2015-05-01 00:28:28 +00:00
Jorim Jaggi
6ac9046d84
am e8d8af2b
: Merge "Update fingerprint settings to spec" into mnc-dev
...
* commit 'e8d8af2b464df3815d1a02c370cf44a80cafd8e3':
Update fingerprint settings to spec
2015-05-01 00:07:47 +00:00
Chris Craik
5364910f2a
am e391e9c2
: am 3401a652
: Merge "Increase clip debug string limit" into mnc-dev
...
* commit 'e391e9c2371a648f5b22141a997426f9c3cc6bc5':
Increase clip debug string limit
2015-05-01 00:07:41 +00:00
Chris Craik
e391e9c237
am 3401a652
: Merge "Increase clip debug string limit" into mnc-dev
...
* commit '3401a652efdaee1558a78659994df262975fd8b4':
Increase clip debug string limit
2015-04-30 23:55:37 +00:00
Jorim Jaggi
e8d8af2b46
Merge "Update fingerprint settings to spec" into mnc-dev
2015-04-30 23:54:33 +00:00
Jorim Jaggi
4dfcb8208c
Update fingerprint settings to spec
...
- Make it look like a sub settings activity, with back button
- Add disclaimer to describe what your fingerprint can be used for
- Update visuals and text for "Add fingerprint"
- Update related string
Bug: 20594955
Change-Id: I0adfcc743db386e0abf9cfdafff3d068ebc3b4bc
2015-04-30 16:54:02 -07:00
Chris Craik
3401a652ef
Merge "Increase clip debug string limit" into mnc-dev
2015-04-30 23:46:45 +00:00
Chris Craik
b5607c10c3
Increase clip debug string limit
...
bug:19189024
Change-Id: I6c9969032d852c6724ceb977705169ec5b8d2a5b
2015-04-30 16:46:02 -07:00
Fyodor Kupolov
bcc40fe5d1
am da84bf8d
: am 729aa932
: Merge "Fixed an issue with back key behavior" into mnc-dev
...
* commit 'da84bf8d2ca3c70dd0cd30abc027ebaec758fb5f':
Fixed an issue with back key behavior
2015-04-30 23:03:43 +00:00
Fyodor Kupolov
da84bf8d2c
am 729aa932
: Merge "Fixed an issue with back key behavior" into mnc-dev
...
* commit '729aa93255b85e37a1f74c61aecf73759299a20e':
Fixed an issue with back key behavior
2015-04-30 22:53:36 +00:00
Fyodor Kupolov
729aa93255
Merge "Fixed an issue with back key behavior" into mnc-dev
2015-04-30 22:41:13 +00:00
Maurice Lam
688319c6ef
am d4933fa1
: am 05a0336b
: [WifiSetup] Use bullets in skip dialog
...
* commit 'd4933fa1c3131c4a28f84a9eb61943bb9cf92638':
[WifiSetup] Use bullets in skip dialog
2015-04-30 22:20:43 +00:00
Yorke Lee
628a98c1df
Rename default dialer to default phone app
...
Change-Id: Ib6c147ba132ed5296de5e932e5dc378183ef92a3
2015-04-30 15:07:41 -07:00
Maurice Lam
d4933fa1c3
am 05a0336b
: [WifiSetup] Use bullets in skip dialog
...
* commit '05a0336bde84489db2700b8adfb8b0e415dc0932':
[WifiSetup] Use bullets in skip dialog
2015-04-30 22:04:32 +00:00
Maurice Lam
05a0336bde
[WifiSetup] Use bullets in skip dialog
...
Use BulletSpan (<li>) to show bullets in the dialog when the user
skips Wi-Fi in setup wizard.
Bug: 20706978
Change-Id: If81bdfad39dd9ffff7543cf531db40d813b57ec8
2015-04-30 14:29:28 -07:00
Maurice Lam
b5ba242188
am 7b31110f
: am 6327c350
: am c5310446
: Merge "[WifiSettings] Align text in Wi-Fi dialog" into mnc-dev
...
* commit '7b31110f25440fafe18c21f93a3f97d1d47b5970':
[WifiSettings] Align text in Wi-Fi dialog
2015-04-30 19:13:17 +00:00
Maurice Lam
3db807300b
am 49a391e0
: am d74b5e02
: am 0063d51c
: Merge "[WifiSetup] Show MAC address in footer" into mnc-dev
...
* commit '49a391e03d6c48c34fe859f54b18b25136d7364b':
[WifiSetup] Show MAC address in footer
2015-04-30 19:13:15 +00:00
Fyodor Kupolov
5654815695
Fixed an issue with back key behavior
...
Create mHeaderView and set it as a pinned header, each time onActivityCreated
is called.
Bug: 20652673
Change-Id: Ia0e174f0686ac0abb601c591f3774c9152b785fa
2015-04-30 12:02:47 -07:00
Maurice Lam
7b31110f25
am 6327c350
: am c5310446
: Merge "[WifiSettings] Align text in Wi-Fi dialog" into mnc-dev
...
* commit '6327c3500b5928e0a7438a8a4728f7f2639fcec5':
[WifiSettings] Align text in Wi-Fi dialog
2015-04-30 18:58:41 +00:00