Billy Lau
f8f9802104
Bug 21589105 Rescope SYSTEM_ALERT_WINDOW (UX and Settings app change)...
...
Overall, fixed the detection of the state of permission in the corresponding UX
to be more accurate. Also ensured that apps can actually launch the summary UX
through a custom intent.
AndroidManifest:
Adds the proper intent-filter so that apps can launch the Settings page using
intent.
strings:
Made changes to strings so that wordings are uniform everywhere and raised the
char limit due to requests from translators.
Change-Id: Ia03403641ad53bd1a33b84dae6db1739cfcf9d60
2015-07-17 18:23:57 +01:00
Daichi Hirono
5e76cdc9dd
Turn the eject menu into a button.
...
BUG=21897892
Change-Id: Icd0db7907b990447c99c4ae65816e85777df0f8e
2015-07-17 15:26:15 +09:00
Makoto Onuki
26cf58aba6
Fix ugly text wrapping on non-english locales
...
Bug 22284618
Change-Id: Iaab017fa5d2f5aeb3457f911cbd31ceb8671e495
2015-07-16 15:45:09 -07:00
Jason Monk
b1d9536e58
Remove tuner from development settings
...
It has a new home now.
Bug: 22462605
Change-Id: Ibf07a63db14579d07b09d5150b7d04cf138f3b78
2015-07-16 16:41:15 -04:00
Julia Reynolds
16eec50576
Remove blank switchtext from switch preferences.
...
This makes TTS services read the default text (on/off) when
these switches are toggled.
Bug: 22530662
Change-Id: I77c5918481faa6309995aa385dcfc3608fc94298
2015-07-16 13:28:16 -04:00
Xiaohui Chen
c49c26bf04
Merge "sys user split: refactor user settings"
2015-07-16 16:16:20 +00:00
Sanket Padawe
423a891b38
am 45c5de2f: am e07fce2c: am 18c31082: am c5be2243: am 046decca: Merge "Use common xml file for multi-tab settings." into mnc-dev
...
* commit '45c5de2f62bcdea70a5f25f60ab10398f5911574':
Use common xml file for multi-tab settings.
2015-07-16 06:02:20 +00:00
Sanket Padawe
45c5de2f62
am e07fce2c: am 18c31082: am c5be2243: am 046decca: Merge "Use common xml file for multi-tab settings." into mnc-dev
...
* commit 'e07fce2c3bde8c8fd5c380a0a524378d0d99e092':
Use common xml file for multi-tab settings.
2015-07-16 05:48:44 +00:00
Sanket Padawe
e07fce2c3b
am 18c31082: am c5be2243: am 046decca: Merge "Use common xml file for multi-tab settings." into mnc-dev
...
* commit '18c31082b397858564f1dc99a785dc77d1814151':
Use common xml file for multi-tab settings.
2015-07-16 05:40:25 +00:00
Sanket Padawe
18c31082b3
am c5be2243: am 046decca: Merge "Use common xml file for multi-tab settings." into mnc-dev
...
* commit 'c5be2243d79ea0a27a7c61ee3aeffdacd7f63b06':
Use common xml file for multi-tab settings.
2015-07-16 05:27:44 +00:00
Sanket Padawe
046decca29
Merge "Use common xml file for multi-tab settings." into mnc-dev
2015-07-16 05:01:27 +00:00
Maurice Lam
2632b5946b
am 1e83db94: am 037ec868: am 85f199d8: am 021b3d95: am bec1d295: Merge "[Fingerprint] Use accent color for fingerprint highlight" into mnc-dev
...
* commit '1e83db942671f4efb28cc1d2d0820649bac7cf66':
[Fingerprint] Use accent color for fingerprint highlight
2015-07-16 03:23:26 +00:00
Maurice Lam
1e83db9426
am 037ec868: am 85f199d8: am 021b3d95: am bec1d295: Merge "[Fingerprint] Use accent color for fingerprint highlight" into mnc-dev
...
* commit '037ec86847055f57fa98db71c7b30ae3030ff16d':
[Fingerprint] Use accent color for fingerprint highlight
2015-07-16 03:10:26 +00:00
Maurice Lam
037ec86847
am 85f199d8: am 021b3d95: am bec1d295: Merge "[Fingerprint] Use accent color for fingerprint highlight" into mnc-dev
...
* commit '85f199d8620c689ae6f0ae94eeda9168fa93c2db':
[Fingerprint] Use accent color for fingerprint highlight
2015-07-16 02:57:00 +00:00
Maurice Lam
85f199d862
am 021b3d95: am bec1d295: Merge "[Fingerprint] Use accent color for fingerprint highlight" into mnc-dev
...
* commit '021b3d955f91eeaa03f8f45401663954560dc748':
[Fingerprint] Use accent color for fingerprint highlight
2015-07-16 02:43:11 +00:00
Maurice Lam
bec1d29558
Merge "[Fingerprint] Use accent color for fingerprint highlight" into mnc-dev
2015-07-16 02:19:19 +00:00
Jason Monk
8dc988c811
am 6d2be9f2: am a4dfe05b: am 543d68cc: am 194e92d3: am 50972605: Merge "Disable ignore battery optimization items that can\'t change" into mnc-dev
...
* commit '6d2be9f2043bbd1fb7e5afc44583c7cc80a7b1a0':
Disable ignore battery optimization items that can't change
2015-07-16 00:04:45 +00:00
Jason Monk
4904f3cbaf
am bfa8e5d5: am 5d780aa9: am f9d8deff: am 7beb763d: am 4a6b9095: Merge "Change move storage from dropdown pref to dialog" into mnc-dev
...
* commit 'bfa8e5d53b53a9accbf567f986b625c9ac473f35':
Change move storage from dropdown pref to dialog
2015-07-16 00:04:43 +00:00
Jason Monk
6d2be9f204
am a4dfe05b: am 543d68cc: am 194e92d3: am 50972605: Merge "Disable ignore battery optimization items that can\'t change" into mnc-dev
...
* commit 'a4dfe05b29118055f9e8d4437655e2354cfb1dd7':
Disable ignore battery optimization items that can't change
2015-07-15 23:48:21 +00:00
Jason Monk
bfa8e5d53b
am 5d780aa9: am f9d8deff: am 7beb763d: am 4a6b9095: Merge "Change move storage from dropdown pref to dialog" into mnc-dev
...
* commit '5d780aa92175ae9d3b1204d67d0c23e943041d8e':
Change move storage from dropdown pref to dialog
2015-07-15 23:48:20 +00:00
Jason Monk
a4dfe05b29
am 543d68cc: am 194e92d3: am 50972605: Merge "Disable ignore battery optimization items that can\'t change" into mnc-dev
...
* commit '543d68cc3a68098bface7335266a46d1ae0603ca':
Disable ignore battery optimization items that can't change
2015-07-15 23:30:21 +00:00
Jason Monk
5d780aa921
am f9d8deff: am 7beb763d: am 4a6b9095: Merge "Change move storage from dropdown pref to dialog" into mnc-dev
...
* commit 'f9d8deffaa79da57f04c9eed50d0d1991daac4b1':
Change move storage from dropdown pref to dialog
2015-07-15 23:30:19 +00:00
Jason Monk
543d68cc3a
am 194e92d3: am 50972605: Merge "Disable ignore battery optimization items that can\'t change" into mnc-dev
...
* commit '194e92d3a0dcc15056fac17690f2f36bdc96861a':
Disable ignore battery optimization items that can't change
2015-07-15 23:20:43 +00:00
Jason Monk
f9d8deffaa
am 7beb763d: am 4a6b9095: Merge "Change move storage from dropdown pref to dialog" into mnc-dev
...
* commit '7beb763da239fb71f214cab0587ae52f383985fc':
Change move storage from dropdown pref to dialog
2015-07-15 23:20:41 +00:00
Maurice Lam
90cc69eeee
am 614cf892: am 3603d8ad: am 2ea2950d: am 77352c65: am 4595978b: Merge "[Fingerprint] Add fingerprint enroll in setup wizard" into mnc-dev
...
* commit '614cf892a6b8813461ff7e5619cb3bc062afcbf6':
[Fingerprint] Add fingerprint enroll in setup wizard
2015-07-15 23:12:19 +00:00
Maurice Lam
614cf892a6
am 3603d8ad: am 2ea2950d: am 77352c65: am 4595978b: Merge "[Fingerprint] Add fingerprint enroll in setup wizard" into mnc-dev
...
* commit '3603d8ad823796a279007feb7af8b00bc532a26e':
[Fingerprint] Add fingerprint enroll in setup wizard
2015-07-15 22:55:49 +00:00
Jason Monk
509726054a
Merge "Disable ignore battery optimization items that can't change" into mnc-dev
2015-07-15 22:48:13 +00:00
Jason Monk
4a6b909559
Merge "Change move storage from dropdown pref to dialog" into mnc-dev
2015-07-15 22:48:06 +00:00
Maurice Lam
3603d8ad82
am 2ea2950d: am 77352c65: am 4595978b: Merge "[Fingerprint] Add fingerprint enroll in setup wizard" into mnc-dev
...
* commit '2ea2950d9c15e2da38d5aece8de7c0079539d99a':
[Fingerprint] Add fingerprint enroll in setup wizard
2015-07-15 22:47:19 +00:00
Maurice Lam
2ea2950d9c
am 77352c65: am 4595978b: Merge "[Fingerprint] Add fingerprint enroll in setup wizard" into mnc-dev
...
* commit '77352c65be3d4106da93609794610d88347e069b':
[Fingerprint] Add fingerprint enroll in setup wizard
2015-07-15 22:32:46 +00:00
Jason Monk
e8400c2fb7
Change move storage from dropdown pref to dialog
...
Use a horizontal pref and a single button that triggers the dialog
Bug: 21922660
Change-Id: Ifb4de75ca9269d2e8163eec5602932260adec0d9
2015-07-15 16:59:28 -04:00
Maurice Lam
4595978b72
Merge "[Fingerprint] Add fingerprint enroll in setup wizard" into mnc-dev
2015-07-15 19:28:06 +00:00
Jason Monk
443513cc0d
Disable ignore battery optimization items that can't change
...
Bug: 22507803
Change-Id: Ia33746dc569f4d9f96242a502e54bcc8eb47bf12
2015-07-15 15:22:38 -04:00
Maurice Lam
8d1f9c9be5
[Fingerprint] Add fingerprint enroll in setup wizard
...
Make a subclass for each enrolling screen that setup wizard uses, and
in override the corresponding get*Intent methods to always use the
setup wizard versions of the next screens.
On minor change made to the original flow is that it will now return
RESULT_OK if it is finished, as opposed to RESULT_CANCELED.
Bug: 21695577
Change-Id: Id666826e8027272ede6a5426967d66fb291670a4
2015-07-15 11:14:22 -07:00
Selim Cinek
854d08be2b
Fixed the layout for the fingerprint renaming
...
Bug: 21957061
Change-Id: I3bf0ecb1f513b51e2632cb9ddbb29e51a39a915c
(cherry picked from commit abd67de1ad )
2015-07-15 17:37:46 +00:00
Geoff Mendal
f3907176da
Import translations. DO NOT MERGE
...
Change-Id: I0bd7d5fb307ffa5fd3b001eaf5cf7697168e90d6
Auto-generated-cl: translation import
2015-07-15 06:56:45 -07:00
Geoff Mendal
fa9a84d738
Import translations. DO NOT MERGE
...
Change-Id: Ib17cc72f3751c9df27f1441b501c1ff1f4c6f714
Auto-generated-cl: translation import
2015-07-15 06:04:18 -07:00
xinhe
9c43d78421
am 5c9874ce: am 53d67679: am 9d95d884: am 7e23bae6: am d7fb46de: Merge "Need to disable 5GHz bands for WiFi tethering in Japan" into mnc-dev
...
* commit '5c9874cefd9bc35c191c85a7744734b0a90a055c':
Need to disable 5GHz bands for WiFi tethering in Japan
2015-07-15 00:04:00 +00:00
xinhe
5c9874cefd
am 53d67679: am 9d95d884: am 7e23bae6: am d7fb46de: Merge "Need to disable 5GHz bands for WiFi tethering in Japan" into mnc-dev
...
* commit '53d676791b55b39364bfe9d3aa47379724e2c2f1':
Need to disable 5GHz bands for WiFi tethering in Japan
2015-07-14 23:47:49 +00:00
xinhe
53d676791b
am 9d95d884: am 7e23bae6: am d7fb46de: Merge "Need to disable 5GHz bands for WiFi tethering in Japan" into mnc-dev
...
* commit '9d95d88442babaa3511d28d89e05a244b97a7bdf':
Need to disable 5GHz bands for WiFi tethering in Japan
2015-07-14 23:39:58 +00:00
xinhe
9d95d88442
am 7e23bae6: am d7fb46de: Merge "Need to disable 5GHz bands for WiFi tethering in Japan" into mnc-dev
...
* commit '7e23bae6c6d8697c1f53ed4a3b8b467d3142fd76':
Need to disable 5GHz bands for WiFi tethering in Japan
2015-07-14 23:26:08 +00:00
xinhe
7e23bae6c6
am d7fb46de: Merge "Need to disable 5GHz bands for WiFi tethering in Japan" into mnc-dev
...
* commit 'd7fb46de591943c402dd13551ca603081ac4e6a7':
Need to disable 5GHz bands for WiFi tethering in Japan
2015-07-14 23:13:03 +00:00
xinhe
d7fb46de59
Merge "Need to disable 5GHz bands for WiFi tethering in Japan" into mnc-dev
2015-07-14 22:29:32 +00:00
xinhe
cbdcca6cf6
Need to disable 5GHz bands for WiFi tethering in Japan
...
b/22396383
Change-Id: I99090f28eff1b232ebba89ff638e37be82a3f21b
2015-07-14 14:39:43 -07:00
Billy Lau
5742b87e5c
am 509f2fe5: am bd5ae865: am 254ce51b: am de784e6a: am 52df60d8: Merge "Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW and WRITE_SETTINGS permission to an explicit toggle to be enabled through Settings via Apps -> Advanced Apps." into mnc-dev
...
* commit '509f2fe51c84e2c0c2d83770710dc8572d0c2223':
Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW and WRITE_SETTINGS permission to an explicit toggle to be enabled through Settings via Apps -> Advanced Apps.
2015-07-14 19:39:17 +00:00
Billy Lau
509f2fe51c
am bd5ae865: am 254ce51b: am de784e6a: am 52df60d8: Merge "Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW and WRITE_SETTINGS permission to an explicit toggle to be enabled through Settings via Apps -> Advanced Apps." into mnc-dev
...
* commit 'bd5ae86579d7aeebc2cff415f1ed355f269387d5':
Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW and WRITE_SETTINGS permission to an explicit toggle to be enabled through Settings via Apps -> Advanced Apps.
2015-07-14 19:23:52 +00:00
Billy Lau
bd5ae86579
am 254ce51b: am de784e6a: am 52df60d8: Merge "Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW and WRITE_SETTINGS permission to an explicit toggle to be enabled through Settings via Apps -> Advanced Apps." into mnc-dev
...
* commit '254ce51b129a6b6a8f98b4641895ab085a3936c9':
Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW and WRITE_SETTINGS permission to an explicit toggle to be enabled through Settings via Apps -> Advanced Apps.
2015-07-14 19:08:46 +00:00
Billy Lau
254ce51b12
am de784e6a: am 52df60d8: Merge "Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW and WRITE_SETTINGS permission to an explicit toggle to be enabled through Settings via Apps -> Advanced Apps." into mnc-dev
...
* commit 'de784e6ab5e86eb780cdeee4a2f01e2db9a1ef07':
Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW and WRITE_SETTINGS permission to an explicit toggle to be enabled through Settings via Apps -> Advanced Apps.
2015-07-14 18:51:58 +00:00
Martijn Coenen
0ebcd356cf
am 9670159d: am f5f40191: am bafffd14: am 35738049: am 8d9bb1ae: Merge "Fix up Tap and Pay how it works." into mnc-dev
...
* commit '9670159d46a16a2151ff6f1ca737babf4c7685b0':
Fix up Tap and Pay how it works.
2015-07-14 18:46:48 +00:00
Billy Lau
de784e6ab5
am 52df60d8: Merge "Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW and WRITE_SETTINGS permission to an explicit toggle to be enabled through Settings via Apps -> Advanced Apps." into mnc-dev
...
* commit '52df60d83dc48818aacbe1721e6aaa9be39e8451':
Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW and WRITE_SETTINGS permission to an explicit toggle to be enabled through Settings via Apps -> Advanced Apps.
2015-07-14 18:36:53 +00:00