Xiyuan Xia
491a6b1389
am a0e052b1
: Merge "Do not show soft keyboard when locked out" into mnc-dev
...
* commit 'a0e052b17b0c730dcd61ad2787c041c75107f106':
Do not show soft keyboard when locked out
2015-05-21 16:22:30 +00: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
939ee55954
am b2e07cd0
: Merge "Remove data item from app info when not supported" into mnc-dev
...
* commit 'b2e07cd0f9e2a869710c6b713f403afc4fbdbfab':
Remove data item from app info when not supported
2015-05-21 13:05:57 +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
Geoff Mendal
e008b99d44
am 462e7008
: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
...
* commit '462e70083fbdd12da55b6a6b98a59750d250f40d':
Import translations. DO NOT MERGE
2015-05-21 03:30:37 +00:00
John Spurlock
8b9dbbe0c8
am fffa7f90
: Merge "Settings: Auto-capitalize edit text for zen autorule names." into mnc-dev
...
* commit 'fffa7f905b809659c3edbbb1663f3a74ce5625bc':
Settings: Auto-capitalize edit text for zen autorule names.
2015-05-21 03:30:36 +00: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
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
84caa25697
am b56a1036
: Merge "Follow up for I8050df3177b6d540829c3f0989a4e4b1381c87ec (2/2)" into mnc-dev
...
* commit 'b56a10368fa3b7f2a359c8cf4a7abf1ba7edf232':
Follow up for I8050df3177b6d540829c3f0989a4e4b1381c87ec (2/2)
2015-05-20 19:11:45 +00:00
Jorim Jaggi
b56a10368f
Merge "Follow up for I8050df3177b6d540829c3f0989a4e4b1381c87ec (2/2)" into mnc-dev
2015-05-20 19:01:50 +00:00
Lorenzo Colitti
8f4bf8677c
am f675409e
: Merge "Address TODOs in WifiNoInternetDialog." into mnc-dev
...
* commit 'f675409e238bcd3df44fe0026a49e89cd30a5bdf':
Address TODOs in WifiNoInternetDialog.
2015-05-20 09:47:41 +00:00
Lorenzo Colitti
f675409e23
Merge "Address TODOs in WifiNoInternetDialog." into mnc-dev
2015-05-20 08:04:43 +00:00
Maurice Lam
12bbde919b
am efbe4661
: Merge "[LockScreen] Update initial string in choose lock screens" into mnc-dev
...
* commit 'efbe46612d3253e683ec14cadabf638450b39486':
[LockScreen] Update initial string in choose lock screens
2015-05-20 01:50:50 +00: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
dc774b618b
am c80084e5
: Merge "Added SearchIndexProvider for UserSettings" into mnc-dev
...
* commit 'c80084e55afeaeebfb0546c0112fb2e666e35700':
Added SearchIndexProvider for UserSettings
2015-05-19 21:47:04 +00:00
Fyodor Kupolov
c80084e55a
Merge "Added SearchIndexProvider for UserSettings" into mnc-dev
2015-05-19 21:44:17 +00:00
Jorim Jaggi
712530794b
Follow up for I8050df3177b6d540829c3f0989a4e4b1381c87ec (2/2)
...
Change-Id: I7623488349209248596827d03fd77cd128f8b2b4
2015-05-19 14:02:05 -07:00
Jeff Sharkey
719d0ad904
am d0393cd0
: Merge "Warn user when adopted device is slow." into mnc-dev
...
* commit 'd0393cd0417ecc8aed686578381745a88fb77f92':
Warn user when adopted device is slow.
2015-05-19 19:10:53 +00: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
Xiyuan Xia
0fa945f099
am 3a310719
: Merge "No input instead of disabling password/pin entry" into mnc-dev
...
* commit '3a310719d816b8608cd51469c62231a1ed41a608':
No input instead of disabling password/pin entry
2015-05-19 18:39:31 +00: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
b340980dee
am ccfbb1d6
: Merge "Monkey should not be allowed to switch USB mode" into mnc-dev
...
* commit 'ccfbb1d6ca30dd495938a6e68ca02410e7ffb6c7':
Monkey should not be allowed to switch USB mode
2015-05-19 18:21:53 +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
e60c44a8e6
am e74fdb8d
: Merge "Remove the check hasMultipleUsers in Settings." into mnc-dev
...
* commit 'e74fdb8d672a361f5a29cded65278054e1683fc6':
Remove the check hasMultipleUsers in Settings.
2015-05-19 18:09:12 +00:00
Jason Monk
0a42a67d4e
am 2b768522
: Merge "Default ignore optimizations to show system apps" into mnc-dev
...
* commit '2b7685224d1021a9e163a2ffc4bf4e8d38b56252':
Default ignore optimizations to show system apps
2015-05-19 18:09:11 +00: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
7526238a74
am 196d0543
: Merge "Badge managed WiFi networks" into mnc-dev
...
* commit '196d0543737cef8fcf5e193af688a093a3743597':
Badge managed WiFi networks
2015-05-19 13:31:37 +00:00
Robin Lee
196d054373
Merge "Badge managed WiFi networks" into mnc-dev
2015-05-19 13:22:10 +00:00
Robin Lee
c0d07e314a
am b5c48a4c
: Merge "VPN: UI for forgetting disconnected VPNs" into mnc-dev
...
* commit 'b5c48a4c347f7aa64b99e80370a63b3f60d3203c':
VPN: UI for forgetting disconnected VPNs
2015-05-19 10:25:58 +00:00
Robin Lee
b5c48a4c34
Merge "VPN: UI for forgetting disconnected VPNs" into mnc-dev
2015-05-19 10:15:04 +00:00
Jorim Jaggi
a351cda36e
am a2138a34
: Merge "Add setting to disable assist data (2/2)." into mnc-dev
...
* commit 'a2138a34852be7bcb793940269592ec5669cc3b4':
Add setting to disable assist data (2/2).
Try not to crash while AppInfo is finishing
Banish the memory page to Apps > Advanced
Fix crash when removing fingerprint
Fix bug #21025020 Stability: JCs in Settings: Caused by: java.lang.NullPointerException
2015-05-19 04:51:08 +00: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
9d2edaf2bc
am 6ee5a4d0
: Update Backup/reset UI
...
* commit '6ee5a4d0ef0386d56c72a8ae81e65443fe5a2979':
Update Backup/reset UI
2015-05-19 01:31:47 +00:00
Matthew Williams
6ee5a4d0ef
Update Backup/reset UI
...
BUG: 20489775
Change-Id: I2c97fdf240ddd3e9f0a518478d5da91b91abe394
2015-05-18 18:16:09 -07:00
Tom O'Neill
cc753b6a02
am 16a45baf
: Merge "LocationSettings javadoc describes what\'s in the UI" into mnc-dev
...
* commit '16a45bafa78f3a2cf2b37879c57441c608b03ab7':
LocationSettings javadoc describes what's in the UI
2015-05-19 00:55:39 +00: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
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
xinhe
43e257381c
am 512bb7e2
: Merge "Rename config AP Band for Select AP Band" into mnc-dev
...
* commit '512bb7e2e37512e22a466942dc7344dc12439648':
Rename config AP Band for Select AP Band
2015-05-18 21:33:49 +00:00