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
The Android Automerger
a4fe6d50c9
merge in mnc-release history after reset to mnc-dev
2015-05-19 01:03:45 -07: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
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
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
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
Sanket Padawe
2a7a5b8e68
am 7186a47e
: Check for special char when renaming device for Wi-Fi direct.
...
* commit '7186a47ef348c17a985eb51ef74469a32c3c938d':
Check for special char when renaming device for Wi-Fi direct.
2015-05-18 21:10:23 +00: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
Sanket Padawe
7186a47ef3
Check for special char when renaming device for Wi-Fi direct.
...
Bug: 21141820
Change-Id: I78231d95e5ba3f505325d5657f8e6106a887f11e
2015-05-18 11:39:01 -07:00
Robin Lee
9aaee290ad
Badge managed WiFi networks
...
Bug: 19504806
Change-Id: I600b41e4bf6d336b7e091968560c6393041fc6b2
2015-05-18 18:42:36 +01:00
Jason Monk
6dbb9ff059
am bbf031ab
: Merge "Try not to crash while AppInfo is finishing" into mnc-dev
...
* commit 'bbf031ab09b445964acb5e7356ba407dd3dc2d33':
Try not to crash while AppInfo is finishing
2015-05-18 13:34:56 +00:00
Jason Monk
bbf031ab09
Merge "Try not to crash while AppInfo is finishing" into mnc-dev
2015-05-18 13:28:03 +00:00
The Android Automerger
cb8d490b90
merge in mnc-release history after reset to mnc-dev
2015-05-18 01:02:32 -07:00
Svet Ganov
9a3ad8a36b
am 67e067ff
: Hide platform platform legacy permissions behind a menu option - settings.
...
* commit '67e067fff4e4ef1eb54f9c238dbf07312434a07e':
Hide platform platform legacy permissions behind a menu option - settings.
2015-05-17 11:23:50 +00:00
Svet Ganov
67e067fff4
Hide platform platform legacy permissions behind a menu option - settings.
...
bug:21195624
Change-Id: Ib1dcfe2a15685c36e2a59e0921ea74d46ec9738c
2015-05-16 22:59:41 -07:00
The Android Automerger
bd78ad5949
merge in mnc-release history after reset to mnc-dev
2015-05-16 01:03:47 -07:00
Jason Monk
874c97a35c
Banish the memory page to Apps > Advanced
...
Bug: 21129029
Change-Id: I5ea6c88505e553a4340e9c60377952af7e802a44
2015-05-15 15:13:29 -07:00
Jeff Sharkey
1661f00ae0
am 11b29e76
: Merge "Initial pass at storage benchmarks." into mnc-dev
...
* commit '11b29e7613a30610981d56786fd5d2e0b7494aab':
Initial pass at storage benchmarks.
2015-05-15 22:08:47 +00:00
Jeff Sharkey
11b29e7613
Merge "Initial pass at storage benchmarks." into mnc-dev
2015-05-15 21:56:01 +00:00
Zoltan Szatmary-Ban
eba12083bf
am cb5444ad
: Merge "Reflect Wifi config lockdown restriction in Settings" into mnc-dev
...
* commit 'cb5444ad2ccf2f16bddafb8844cde6a1a92adddb':
Reflect Wifi config lockdown restriction in Settings
2015-05-15 20:31:58 +00:00
Zoltan Szatmary-Ban
cb5444ad2c
Merge "Reflect Wifi config lockdown restriction in Settings" into mnc-dev
2015-05-15 20:22:34 +00:00
Jason Monk
65ecadc625
Try not to crash while AppInfo is finishing
...
Bug: 21025020
Change-Id: Iebb9e6b24ca503f87b5648f0aaf02dde01903488
2015-05-15 13:07:45 -04:00
Jason Monk
1f7861b608
am 0c0e35ef
: Banish the memory page to Apps > Advanced
...
* commit '0c0e35ef3008e3b2c8c67d7454cbe46d3d848625':
Banish the memory page to Apps > Advanced
2015-05-15 16:26:33 +00:00
Jason Monk
0c0e35ef30
Banish the memory page to Apps > Advanced
...
Bug: 21129029
Change-Id: I5ea6c88505e553a4340e9c60377952af7e802a44
2015-05-15 11:37:42 -04:00
Jeff Sharkey
58003515ca
Initial pass at storage benchmarks.
...
After adopting a disk, run benchmarks to compare its performance
against internal storage.
Bug: 21172095
Change-Id: I7c9a5a89e37f7156677fc76bd1ba193eead6665e
2015-05-14 21:08:50 -07:00
Matthew Williams
8c5d388922
am 5af3d6f5
: Add strings for fullbackup data erase confirmation
...
* commit '5af3d6f5cb95d654b963eae94155285e4e23a97e':
Add strings for fullbackup data erase confirmation
2015-05-15 02:17:52 +00:00
Matthew Williams
5af3d6f5cb
Add strings for fullbackup data erase confirmation
...
Added a new string called fullbackup_erase_dialog_message which
will be displayed when the user has seen the "opted into dolly"
text.
Old string remains in place for the case where the user
hasn't seen the text.
BUG: 20489775
Change-Id: Id6675d1510cf1598f84fdfdcda7f6502a6cf6715
2015-05-14 18:57:32 -07:00
Jorim Jaggi
c3fb482ffe
Fix crash when removing fingerprint
...
Also fix a strings in fingerprint enrollment.
Bug: 21030545
Change-Id: I2d250b51a01f02bee014d4bc8e192d11199113e3
2015-05-14 17:14:36 -07:00
Svet Ganov
def90c568c
am 3bd7db9f
: Merge "Fix a typo." into mnc-dev
...
* commit '3bd7db9f85a27f98f59b254764a41914905020d7':
Fix a typo.
2015-05-14 23:45:35 +00:00