Sean Francis-Lyon
8452a62216
DO NOT MERGE show correct backup status
...
show correct backup status after dismissing are-you-sure dialog
for turnning off backup and restore in settings
Change-Id: I31c4106cab58f84b77568356188e5ce49ca3430b
(cherry picked from commit f833588dae
2015-05-21 22:42:56 +00:00
Maurice Lam
51eec32afa
Merge "[LockScreenSetup] Move retry button to top" into mnc-dev
2015-05-21 21:55:48 +00:00
Jorim Jaggi
19ea8b7034
Merge "Fix string for fingerprint settings" into mnc-dev
2015-05-21 21:23:57 +00:00
Jason Monk
df283601c5
Banish Theme setting to developer options
...
Bug: 21320576
Change-Id: I7e3fd7437409ac2dd061a36803e082eada5b30b1
2015-05-21 16:46:24 -04:00
Jason Monk
ce6f165104
Merge "Fix loading screen one more time" into mnc-dev
2015-05-21 20:13:37 +00:00
Jason Monk
74ecb1f211
Fix loading screen one more time
...
Don't rebuild the app list until the entry load is complete to avoid
having a slowly populating list shown to the user.
Bug: 21086054
Change-Id: I801ab292fdbf6801c1b9c8f957336660810da5f6
2015-05-21 16:09:41 -04:00
Xiyuan Xia
a0e052b17b
Merge "Do not show soft keyboard when locked out" into mnc-dev
2015-05-21 16:16:07 +00:00
Jason Monk
b2e07cd0f9
Merge "Remove data item from app info when not supported" into mnc-dev
2015-05-21 12:55:31 +00:00
Jason Monk
b45e27bc0f
Remove data item from app info when not supported
...
Bug: 21207963
Change-Id: I91693d9a85c0905cbb021181967fa16aac61d3ea
2015-05-21 08:43:25 -04:00
The Android Automerger
f74ae87f35
merge in mnc-release history after reset to mnc-dev
2015-05-21 01:04:45 -07:00
Geoff Mendal
462e70083f
Merge "Import translations. DO NOT MERGE" into mnc-dev
2015-05-21 03:26:57 +00:00
Geoff Mendal
bcb20a9f52
Import translations. DO NOT MERGE
...
Change-Id: Ibf8eea922fe4322ec29f6837bfb399c85b4cfbcf
Auto-generated-cl: translation import
2015-05-20 20:20:56 -07:00
John Spurlock
fffa7f905b
Merge "Settings: Auto-capitalize edit text for zen autorule names." into mnc-dev
2015-05-21 03:19:20 +00:00
John Spurlock
b3d2f08e24
Settings: Auto-capitalize edit text for zen autorule names.
...
Bug: 21337479
Change-Id: I424adf94a0717cb4ca75576e2047cbaf387bb947
2015-05-20 23:14:49 -04:00
Maurice Lam
a9a04efe89
[LockScreenSetup] Move retry button to top
...
Move retry button to top, under the subheader, and change the label
to "Clear". Also hide the footer textView since all footer labels are
currently empty.
Bug: 20916604
Change-Id: I7915a132945687815dbb16ce0a60207cc02eed2b
2015-05-21 03:04:11 +00:00
Xiyuan Xia
4a8edaf8b0
Do not show soft keyboard when locked out
...
- Remove stateVisible for ConfirmLockPassword activity so that
soft keyboard does not auto show up when the activity starts;
- Programatically show/hide soft keyboard when ConfirmLockPassword
activity window gains focus;
Bug:20542149
Change-Id: I3faa20312d2d25752bd35b70dc8ed785e7687f0a
2015-05-20 14:43:36 -07:00
Jorim Jaggi
b56a10368f
Merge "Follow up for I8050df3177b6d540829c3f0989a4e4b1381c87ec (2/2)" into mnc-dev
2015-05-20 19:01:50 +00:00
Lorenzo Colitti
f675409e23
Merge "Address TODOs in WifiNoInternetDialog." into mnc-dev
2015-05-20 08:04:43 +00:00
The Android Automerger
7d348e5698
merge in mnc-release history after reset to mnc-dev
2015-05-20 01:04:36 -07:00
Maurice Lam
efbe46612d
Merge "[LockScreen] Update initial string in choose lock screens" into mnc-dev
2015-05-20 01:42:42 +00:00
Maurice Lam
163dee9fb7
[LockScreen] Update initial string in choose lock screens
...
In choose password and PIN screens, change the initial string from
duplicate of the title ("Choose your password/PIN") to the
verification string ("PIN must be at least ? digits" / "Password must
be at least ? characters").
Bug: 20948877
Change-Id: I635ec625f2820e522cdfc983e13ee71706e7004e
2015-05-19 17:27:12 -07:00
Fyodor Kupolov
a7a7bfe59f
Use DimmableIconPreference for Add user action
...
Moved DimmableIconPreference from location to the root package since it is
now used in several places.
Add user action now uses DimmableIconPreference. Added a new summary string,
which is displayed when no more users can be added.
Bug: 20892920
Change-Id: I00b00f80ba8933a00a2de85777b9f7e55d03c31b
2015-05-19 16:44:13 -07:00
Fyodor Kupolov
c80084e55a
Merge "Added SearchIndexProvider for UserSettings" into mnc-dev
2015-05-19 21:44:17 +00:00
Jorim Jaggi
3099997b46
Fix string for fingerprint settings
...
Also adjust fingerprint enrollment animation to spec.
Bug: 21030545
Change-Id: I937e4ea7ab4a51fa0b57b8b4c6b3038453d8f05e
2015-05-19 14:10:05 -07:00
Jorim Jaggi
712530794b
Follow up for I8050df3177b6d540829c3f0989a4e4b1381c87ec (2/2)
...
Change-Id: I7623488349209248596827d03fd77cd128f8b2b4
2015-05-19 14:02:05 -07:00
Guang Zhu
9d9366004e
Monkey should not be allowed to switch USB mode
...
Change-Id: Ifb4865d234e0d9e6453f88d37c12744b9daefa62
2015-05-19 12:19:19 -07:00
Jeff Sharkey
d0393cd041
Merge "Warn user when adopted device is slow." into mnc-dev
2015-05-19 19:03:35 +00:00
Jeff Sharkey
0de2014380
Warn user when adopted device is slow.
...
For now, warn user if benchmark takes longer than a simple threshold
of 2 seconds.
Bug: 21172095
Change-Id: I6d43ee93ac2ff669115519e6a856f8c314915a47
2015-05-19 12:00:56 -07:00
Fyodor Kupolov
c9a95ef6e7
Added SearchIndexProvider for UserSettings
...
It enables customizations for certain cases like whether the user is able to
create restricted profiles or multiuser UI is disabled.
Bug: 21197002
Change-Id: Ia672c0f9bb451877f8debe04438b46cb2b7e9242
2015-05-19 11:31:49 -07:00
Xiyuan Xia
3a310719d8
Merge "No input instead of disabling password/pin entry" into mnc-dev
2015-05-19 18:30:19 +00:00
Guang Zhu
ccfbb1d6ca
Merge "Monkey should not be allowed to switch USB mode" into mnc-dev
2015-05-19 18:14:48 +00:00
Guang Zhu
72aa537980
Monkey should not be allowed to switch USB mode
...
Change-Id: Ifb4865d234e0d9e6453f88d37c12744b9daefa62
2015-05-19 11:09:40 -07:00
Nicolas Prevot
e74fdb8d67
Merge "Remove the check hasMultipleUsers in Settings." into mnc-dev
2015-05-19 17:58:46 +00:00
Jason Monk
2b7685224d
Merge "Default ignore optimizations to show system apps" into mnc-dev
2015-05-19 17:57:13 +00:00
Jason Monk
2c56d450dd
Default ignore optimizations to show system apps
...
Bug: 21211422
Change-Id: Ied526cffa86406b8b81824cf2cdb03cc37bb7433
2015-05-19 13:08:39 -04:00
Lorenzo Colitti
56bd6c338e
Address TODOs in WifiNoInternetDialog.
...
Bug: 20081183
Change-Id: I30a4f04ca892796a674ff0306aafaed485126092
2015-05-20 00:37:38 +09:00
Robin Lee
196d054373
Merge "Badge managed WiFi networks" into mnc-dev
2015-05-19 13:22:10 +00:00
Robin Lee
b5c48a4c34
Merge "VPN: UI for forgetting disconnected VPNs" into mnc-dev
2015-05-19 10:15:04 +00:00
The Android Automerger
a4fe6d50c9
merge in mnc-release history after reset to mnc-dev
2015-05-19 01:03:45 -07:00
Jorim Jaggi
a2138a3485
Merge "Add setting to disable assist data (2/2)." into mnc-dev
2015-05-19 04:40:10 +00:00
Jorim Jaggi
bc38a9a0ab
Add setting to disable assist data (2/2).
...
Bug: 20944446
Change-Id: I3c518176cab88ce9b5031a0241bee30240e6f896
2015-05-18 21:38:45 -07:00
Matthew Williams
6ee5a4d0ef
Update Backup/reset UI
...
BUG: 20489775
Change-Id: I2c97fdf240ddd3e9f0a518478d5da91b91abe394
2015-05-18 18:16:09 -07:00
Tom O'Neill
16a45bafa7
Merge "LocationSettings javadoc describes what's in the UI" into mnc-dev
2015-05-19 00:44:36 +00:00
Sanket Padawe
12291cec6e
Fix generation of pin for WPS on screen rotation.
...
Bug: 21170548
Change-Id: Ib670214fec2776d48739c42a41b854c50be2740d
2015-05-18 15:33:27 -07:00
Robin Lee
01b35bcae3
VPN: UI for forgetting disconnected VPNs
...
Made possible by expanded internal VPN APIs.
Bug: 20872408
Bug: 20692490
Bug: 20747154
Change-Id: Idc87084a130afa18b27c85cc9d4b5033dcedaabe
2015-05-18 22:55:15 +01:00
Jason Monk
07b2d119ec
Try not to crash while AppInfo is finishing
...
Bug: 21025020
Change-Id: Iebb9e6b24ca503f87b5648f0aaf02dde01903488
2015-05-18 14:24:01 -07:00
xinhe
512bb7e2e3
Merge "Rename config AP Band for Select AP Band" into mnc-dev
2015-05-18 21:22:09 +00:00
xinhe
baf4dab3a8
Rename config AP Band for Select AP Band
...
Bug:19095100
Change-Id: I18af303a56cf81b2a113c4a05e913dc7abbb88a8
2015-05-18 14:19:58 -07:00
Tom O'Neill
67dc554030
LocationSettings javadoc describes what's in the UI
...
- In particular, tells OEMs how to add their own settings
Change-Id: I45e4fb7ff59705a2bcb53a72c71fd230f2e085c5
2015-05-18 14:13:29 -07:00
Xiyuan Xia
f2c2c19339
No input instead of disabling password/pin entry
...
So that the keyboard does not come and go all the time.
Bug:21271425
Change-Id: If73109fca1417c43307dc6069307789031ffc607
2015-05-18 13:10:28 -07:00
