Jason Monk
94b7585895
am 50972605: Merge "Disable ignore battery optimization items that can\'t change" into mnc-dev
...
* commit '509726054a3efc09d65d6c15f485ea6f1da2d272':
Disable ignore battery optimization items that can't change
2015-07-15 23:01:53 +00:00
Jason Monk
5fa374cc20
am 4a6b9095: Merge "Change move storage from dropdown pref to dialog" into mnc-dev
...
* commit '4a6b909559d50e02833afd5119876df070dfd458':
Change move storage from dropdown pref to dialog
2015-07-15 23:01:51 +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
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
58a6af1496
am 4595978b: Merge "[Fingerprint] Add fingerprint enroll in setup wizard" into mnc-dev
...
* commit '4595978b72eda7ed53ce0c0cbb763bed02ea13ab':
[Fingerprint] Add fingerprint enroll in setup wizard
2015-07-15 19:38:05 +00:00
Jim Miller
2a414b9368
am 6b9d7889: Merge "Fixed the layout for the fingerprint renaming" into mnc-dev
...
* commit '6b9d788914a600917e8edd4ecd502d6ccf87ca12':
Fixed the layout for the fingerprint renaming
2015-07-15 19:30:55 +00: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
xinhe
e9c822b0c6
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 22:40:35 +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
45b27c3a04
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:37:09 +00:00
Billy Lau
52df60d83d
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
2015-07-14 18:22:30 +00:00
Martijn Coenen
90d21f0967
am 8d9bb1ae: Merge "Fix up Tap and Pay how it works." into mnc-dev
...
* commit '8d9bb1ae1d551699ba85061001ced90a157ae9ad':
Fix up Tap and Pay how it works.
2015-07-14 07:57:35 +00:00
Martijn Coenen
8d9bb1ae1d
Merge "Fix up Tap and Pay how it works." into mnc-dev
2015-07-14 07:45:01 +00:00
Billy Lau
7f70ba18e6
Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW and WRITE_SETTINGS permission to an
...
explicit toggle to be enabled through Settings via Apps -> Advanced Apps.
Added new and refactored an old xml to define the UX for two new Preferences
in Advanced Settings. Modified the existing AdvancedAppSettings to add
control flow for two new settings. Also enriched ManageApplications to
handle these cases. Added additional strings in xml/values/strings.xml
to support these settings. Also defined new classes to handle these the
toggle of these permissions per app.
Refactored codes from AppStateUsageBridge to a generic AppStateAppOpsBridge so
that future usages related to AppOps can inherit from this class.
Change-Id: I43b81282a063e05844c7805556a6d05cfc02bcdb
2015-07-13 22:39:49 +01:00
Jason Monk
34e7b4cd05
am 53dd1d4d: Merge "Fix app icon size" into mnc-dev
...
* commit '53dd1d4deea9968f1255018248ff0393252032dd':
Fix app icon size
2015-07-13 18:12:35 +00:00
Jason Monk
53dd1d4dee
Merge "Fix app icon size" into mnc-dev
2015-07-13 18:05:54 +00:00
Jason Monk
061c8af3d6
Fix app icon size
...
Bug: 22425103
Change-Id: I35b3476eb75d221e5f244702534d4475b2c5921e
2015-07-13 12:18:43 -04:00
Geoff Mendal
a0838470f3
Import translations. DO NOT MERGE
...
Change-Id: Ice9d7f5cfe191a669657298432c0ecfae0f438bb
Auto-generated-cl: translation import
2015-07-13 06:53:26 -07:00
Geoff Mendal
da15ade830
Import translations. DO NOT MERGE
...
Change-Id: Ib1f4051b1001de52b74483fc18eaf909e656de67
Auto-generated-cl: translation import
2015-07-11 06:59:16 -07:00
Rubin Xu
20eb7e10f2
am 331b9823: Merge "Remove unused MediaFormat activity" into mnc-dev
...
* commit '331b9823d0a686d414f181ed406181d1d4e2aa1a':
Remove unused MediaFormat activity
2015-07-10 19:03:18 +00:00
Rubin Xu
331b9823d0
Merge "Remove unused MediaFormat activity" into mnc-dev
2015-07-10 18:47:51 +00:00
Martijn Coenen
91dcad4089
Fix up Tap and Pay how it works.
...
Also, don't use HCE service description.
Bug: 21988684
Bug: 21657963
Change-Id: I2facb30b80da5452ef14592c937e2db850c33835
2015-07-10 15:43:25 +02:00
Rubin Xu
af43d4ddb4
Remove unused MediaFormat activity
...
As part of cleanup of ExternalStorageFormatter.
Bug: 9433509
Change-Id: I4d2bca544e00a549d8c136713da59d07648b9ffe
2015-07-09 21:29:11 +01:00
Julia Reynolds
46ea05da72
am 963e3fdd: Merge "Talkback improvements for Settings screens." into mnc-dev
...
* commit '963e3fdd05156bb11e6692222b2d08b34c7d126b':
Talkback improvements for Settings screens.
2015-07-09 19:08:36 +00:00
Julia Reynolds
963e3fdd05
Merge "Talkback improvements for Settings screens." into mnc-dev
2015-07-09 18:57:24 +00:00
Julia Reynolds
ce25af4838
Talkback improvements for Settings screens.
...
Bug: 21164141
Change-Id: I7444261ccf967f6db70c9fe44a00bd3f19ceb975
2015-07-09 13:21:20 -04:00
Amit Mahajan
5fc2772b5d
am 01ce80b5: Merge "Remove \'do not translate\' comment for string \'None\'." into mnc-dev
...
* commit '01ce80b574e2404d911750c16a1ddd89c787f3ff':
Remove 'do not translate' comment for string 'None'.
2015-07-08 20:37:01 +00:00
Sanket Padawe
2d633c9744
am c7777b94: Merge "Locale based string changes in BT." into mnc-dev
...
* commit 'c7777b947097160cd89252f1f1e27704d82c25f6':
Locale based string changes in BT.
2015-07-08 20:37:00 +00:00
Amit Mahajan
01ce80b574
Merge "Remove 'do not translate' comment for string 'None'." into mnc-dev
2015-07-08 20:24:10 +00:00
Amit Mahajan
3cd87a2f70
Remove 'do not translate' comment for string 'None'.
...
Bug: 22278463
Change-Id: I29c288cd36cd7b65132b42a4b78749afa81064d6
2015-07-08 11:07:34 -07:00
Sanket Padawe
c7777b9470
Merge "Locale based string changes in BT." into mnc-dev
2015-07-08 17:15:57 +00:00
Geoff Mendal
5a416db19e
Import translations. DO NOT MERGE
...
Change-Id: I442dee3b1b41104a76dc1293208010feb77dba7e
Auto-generated-cl: translation import
2015-07-08 08:19:19 -07:00
Sanket Padawe
aa165e0a50
Locale based string changes in BT.
...
Bug: 22219203
Change-Id: Ic920621baf769032475da32ea425097aafa0922e
2015-07-07 12:13:08 -07:00
Jorim Jaggi
09c3074018
am 2bd619d5: Merge "Text changes to assist & voice input" into mnc-dev
...
* commit '2bd619d5ed2cdf5a34c3e3830469edc3b29a6eb0':
Text changes to assist & voice input
2015-07-06 21:05:44 +00:00
Jorim Jaggi
2bd619d5ed
Merge "Text changes to assist & voice input" into mnc-dev
2015-07-06 20:48:40 +00:00
Jorim Jaggi
ae6e7292fa
Text changes to assist & voice input
...
Bug: 22063668
Change-Id: I3454f6409d1f5816469505404c77d6a02e53aa50
2015-07-06 18:49:26 +00:00
Jeff Sharkey
139e196471
am 7616b00b: Merge changes from topic \'mig\' into mnc-dev
...
* commit '7616b00bb5968382c5f49394fc842049f7ce9185':
Fix some ordering, colors, and accessibility bugs.
Handle missing migration source volume.
2015-07-06 18:12:39 +00:00
Jeff Sharkey
7616b00bb5
Merge changes from topic 'mig' into mnc-dev
...
* changes:
Fix some ordering, colors, and accessibility bugs.
Handle missing migration source volume.
2015-07-06 17:57:53 +00:00
Geoff Mendal
e21573da92
Import translations. DO NOT MERGE
...
Change-Id: I2ca583a0b6b57e1c1cc27e5aaae009e85f906b86
Auto-generated-cl: translation import
2015-07-06 07:49:17 -07:00
Jeff Sharkey
48751c1a51
Fix some ordering, colors, and accessibility bugs.
...
When adding preferences to public/private details screens, always
add in-order when rebuilding. Hacky fix for broken summary text and
eject image color tints.
Fix crash when device rotated during partitioning. Set correct
accessibility titles in all wizard steps.
Bug: 22098044, 21376962
Change-Id: I68aff96cba497a91919cad8865722bc9cef7eaa7
2015-07-05 22:10:13 -07:00
Geoff Mendal
f3bcb99430
Import translations. DO NOT MERGE
...
Change-Id: Ibe88fd3db790a357712803481a4a3dc2befe22cc
Auto-generated-cl: translation import
2015-07-01 07:52:03 -07:00
Jason Monk
e86de04dd6
am a992bb3d: am 6799ef42: Merge "Reduce jank in wifi settings" into mnc-dev
...
* commit 'a992bb3dfb94705053ca91ac9d31e8a530d2b984':
Reduce jank in wifi settings
2015-06-30 14:21:05 +00:00
Jason Monk
a992bb3dfb
am 6799ef42: Merge "Reduce jank in wifi settings" into mnc-dev
...
* commit '6799ef423b18c37c9a8a3684159dd185f61a0931':
Reduce jank in wifi settings
2015-06-30 14:12:38 +00:00
Jason Monk
6799ef423b
Merge "Reduce jank in wifi settings" into mnc-dev
2015-06-30 14:03:05 +00:00