Daichi Hirono
5e76cdc9dd
Turn the eject menu into a button.
...
BUG=21897892
Change-Id: Icd0db7907b990447c99c4ae65816e85777df0f8e
2015-07-17 15:26:15 +09:00
Xiaohui Chen
c49c26bf04
Merge "sys user split: refactor user settings"
2015-07-16 16:16:20 +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
bec1d29558
Merge "[Fingerprint] Use accent color for fingerprint highlight" into mnc-dev
2015-07-16 02:19:19 +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
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
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
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
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
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
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
Maurice Lam
9fa8d9f248
[Fingerprint] Use accent color for fingerprint highlight
...
Set the fingerprint activated color, while registering a new
fingerprint to be 50% alpha of the accent color. This allows the
color to be changed with the theme, so that it will be highlighted
blue during setup wizard.
Bug: 21695577
Change-Id: Iee68506a4fbb8e8996bdb52694992ac460ae943d
2015-07-14 01:22:38 +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
Rubin Xu
46175909ed
am 6e2c1c2e: am bd2e045e: am a383b02c: am 8b9a9519: am 331b9823: Merge "Remove unused MediaFormat activity" into mnc-dev
...
* commit '6e2c1c2e68f6ff40c7201550446e29c8411154b7':
Remove unused MediaFormat activity
2015-07-10 19:47:04 +00:00
Rubin Xu
331b9823d0
Merge "Remove unused MediaFormat activity" into mnc-dev
2015-07-10 18:47:51 +00:00
Xiaohui Chen
64f530c2f1
sys user split: refactor user settings
...
BUG:19913735
Change-Id: I11e0c728d45bd74b60db89f352b356e97b755651
2015-07-09 15:31:39 -07: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
8abecf1bb9
am e124fabb: am e10b32ba: am 1bde3259: am df778e8e: am 963e3fdd: Merge "Talkback improvements for Settings screens." into mnc-dev
...
* commit 'e124fabbf3a17791d59e76723d7a466a1a7bd756':
Talkback improvements for Settings screens.
2015-07-09 20:10:05 +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
2d2fa18279
am f3053c15: am e08a3512: am 07578125: am 2856c4fc: am 01ce80b5: Merge "Remove \'do not translate\' comment for string \'None\'." into mnc-dev
...
* commit 'f3053c15e3cb09af1e6939d2632a3476506be74a':
Remove 'do not translate' comment for string 'None'.
2015-07-08 21:37:53 +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
Jorim Jaggi
2e57c997fe
am bbd59cc2: am 21b05211: am a0357604: am 30001127: am 2bd619d5: Merge "Text changes to assist & voice input" into mnc-dev
...
* commit 'bbd59cc252ec037c5b385b2c1c74c39f00e27c49':
Text changes to assist & voice input
2015-07-07 00:32:56 +00:00
Jorim Jaggi
ae6e7292fa
Text changes to assist & voice input
...
Bug: 22063668
Change-Id: I3454f6409d1f5816469505404c77d6a02e53aa50
2015-07-06 18:49:26 +00:00
Jorim Jaggi
0f4f09c3d3
am 6c8e6503: am ea53bfcd: am d9bd96b3: Add setting to disable screenshot separately (2/2)
...
* commit '6c8e6503084845b8923b9a63c300c8f6e3dd519c':
Add setting to disable screenshot separately (2/2)
2015-06-30 01:01:18 +00:00
Jorim Jaggi
d9bd96b309
Add setting to disable screenshot separately (2/2)
...
Bug: 22063668
Change-Id: I85b255ac114184e0edbd71010d517b337ad935e5
2015-06-29 14:50:45 -07:00
Sanket Padawe
0d71e6f47e
am 4e484afa: am d52bd38d: am 52dce9d3: Merge "Hide EAP SIM, AKA & AKA\' choices in wifi Settings if device doesn\'t support." into mnc-dev
...
* commit '4e484afa128a1883ef5e5a104fda0607856d6f3b':
Hide EAP SIM, AKA & AKA' choices in wifi Settings if device doesn't support.
2015-06-28 03:22:38 +00:00
Sanket Padawe
52dce9d334
Merge "Hide EAP SIM, AKA & AKA' choices in wifi Settings if device doesn't support." into mnc-dev
2015-06-28 02:45:48 +00:00
Sanket Padawe
94c0b0d436
Hide EAP SIM, AKA & AKA' choices in wifi Settings if device doesn't support.
...
Bug: 22014309
Change-Id: I606649cb4d2e13330afa89075ad074e7dc525f87
2015-06-26 15:57:43 -07:00
Selim Cinek
185c777b9d
am fa368b88: am cf1e2a12: am f2f29ff5: Merge "Increased the error message font size" into mnc-dev
...
* commit 'fa368b8892bac1d92436c08f4067abbc76c33537':
Increased the error message font size
2015-06-25 23:04:09 +00:00
Selim Cinek
f2f29ff557
Merge "Increased the error message font size" into mnc-dev
2015-06-25 22:25:31 +00:00
Selim Cinek
f0eebe7e9d
Increased the error message font size
...
Bug: 21568693
Change-Id: I059b962950335f5780783953505ec1e1f0e5b591
2015-06-25 18:12:21 -04:00
Jason Monk
1342ec8505
am 4c1b0b7d: am bdb83ba4: am fb6e1186: Fix accessibility for account sync
...
* commit '4c1b0b7d25b32028b5401efb39a29dac1f550867':
Fix accessibility for account sync
2015-06-25 20:16:28 +00:00
Jason Monk
fb6e1186ab
Fix accessibility for account sync
...
Needed to get views recycling so that feedback could occur during
switch turning off.
Bug: 20020216
Change-Id: Ib7b1cdca78f5ac5064cdf521122ff7a5ee49f572
2015-06-25 15:06:00 -04:00
Akshay Kannan
84e14f296f
am bc99d35e: am 2f7fea73: am 5006bf1d: Merge "Language Update for Wi-Fi/Bluetooth Scanning" into mnc-dev
...
* commit 'bc99d35e38b83c7f7a19fd2bf591c15618d6161a':
Language Update for Wi-Fi/Bluetooth Scanning
2015-06-24 16:34:06 +00:00
Akshay Kannan
5006bf1de7
Merge "Language Update for Wi-Fi/Bluetooth Scanning" into mnc-dev
2015-06-24 15:55:32 +00:00
Lifu Tang
55601622d5
Language Update for Wi-Fi/Bluetooth Scanning
...
Bug: 22046234
Change-Id: Iea8fa2368d1e568a8e1fdd3edefa8f4fc6053e48
2015-06-23 18:54:27 -07:00
Selim Cinek
f3834ed1b5
am c9d3f895: am ae3693d4: am 1726b2c9: Merge "Added contentDescription for fingerprint on the confirmCredential screen" into mnc-dev
...
* commit 'c9d3f895295c578652f13b331bec1fe02394224b':
Added contentDescription for fingerprint on the confirmCredential screen
2015-06-23 23:17:37 +00:00
Selim Cinek
cf8347b33f
Added contentDescription for fingerprint on the confirmCredential screen
...
Bug: 21850269
Change-Id: Ia3720451a74e69e119b60121d7906274c522f70a
2015-06-23 17:48:48 -04:00
Alan Viverette
3a1e634a59
am be0c398c: am 270353f6: am 8a4e44ba: Merge "Ensure "default" and "none" caption colors are consistent w/ framework" into mnc-dev
...
* commit 'be0c398cdac1a4441e15e4cbc806dc23286de85d':
Ensure "default" and "none" caption colors are consistent w/ framework
2015-06-22 21:57:00 +00:00
Alan Viverette
751625e9a2
Ensure "default" and "none" caption colors are consistent w/ framework
...
Also enables scroll indicators in color grid dialog.
Bug: 21602597
Change-Id: I7fabd36787fc8689966eb8dcece3d4d047ee8066
2015-06-22 13:05:45 -07:00
Jason Monk
e09535541d
am 591aa6ae: am d8c811d8: am b4b590d1: Merge "Update disable dialog" into mnc-dev
...
* commit '591aa6ae9ed7bd254df849fd154ce2de70eb60c1':
Update disable dialog
2015-06-22 16:07:16 +00:00
Jason Monk
b4b590d13f
Merge "Update disable dialog" into mnc-dev
2015-06-22 14:55:14 +00:00
Jason Monk
0591282f2a
am 9c4c45b3: am 6a7c7562: am d63e6969: Merge "Add content description to owner info status text" into mnc-dev
...
* commit '9c4c45b34013514b4f8a734b3f8d146dc613e46b':
Add content description to owner info status text
2015-06-19 16:26:37 +00:00
Jason Monk
2e78f53af1
Add content description to owner info status text
...
Bug: 21799551
Change-Id: I8fe82d304309949a5a46492f7d20c58e006baea3
2015-06-19 11:17:03 -04:00
Brian Carlstrom
be12161f9e
am 34e39e7c: am 9dca3951: am 2567514a: Merge "Clarify process_dex2oat_label description" into mnc-dev
...
* commit '34e39e7cff699c9fb38c3d92276099ef99e97de8':
Clarify process_dex2oat_label description
2015-06-19 14:18:37 +00:00