Fyodor Kupolov
eecff41cfc
am dc774b61
: am c80084e5
: Merge "Added SearchIndexProvider for UserSettings" into mnc-dev
...
* commit 'dc774b618bf8f0ce30b50fe2f4bb0972308a34f7':
Added SearchIndexProvider for UserSettings
2015-05-19 22:52:06 +00:00
Jeff Sharkey
1ccf44418e
am 719d0ad9
: am d0393cd0
: Merge "Warn user when adopted device is slow." into mnc-dev
...
* commit '719d0ad90479fc84d0dad1a8fa539b7fee4da746':
Warn user when adopted device is slow.
2015-05-19 22:51:15 +00:00
Xiyuan Xia
a61ad9e5e5
am 0fa945f0
: am 3a310719
: Merge "No input instead of disabling password/pin entry" into mnc-dev
...
* commit '0fa945f099364ff05e42899a1da989b12da0a043':
No input instead of disabling password/pin entry
2015-05-19 22:51:07 +00:00
Guang Zhu
7375f0df89
am b340980d
: am ccfbb1d6
: Merge "Monkey should not be allowed to switch USB mode" into mnc-dev
...
* commit 'b340980deea8a6948d4e8a602557b5721d45a662':
Monkey should not be allowed to switch USB mode
2015-05-19 22:50:48 +00:00
Nicolas Prevot
93a4655460
am e60c44a8
: am e74fdb8d
: Merge "Remove the check hasMultipleUsers in Settings." into mnc-dev
...
* commit 'e60c44a8e6ac1fe0c22d57f649462d3657cb293e':
Remove the check hasMultipleUsers in Settings.
2015-05-19 22:50:35 +00:00
Jason Monk
070b24ade2
am 0a42a67d
: am 2b768522
: Merge "Default ignore optimizations to show system apps" into mnc-dev
...
* commit '0a42a67d4e27fe5b144e2fd41efb8cc273ec63eb':
Default ignore optimizations to show system apps
2015-05-19 22:50:34 +00: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
Fyodor Kupolov
db80e588c0
am e84a5eac
: Merge "Remove the check hasMultipleUsers in Settings."
...
* commit 'e84a5eac2cff89a2e380935ee10c685e4b1a58f0':
Remove the check hasMultipleUsers in Settings.
2015-05-19 21:17:48 +00: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
Fyodor Kupolov
e84a5eac2c
Merge "Remove the check hasMultipleUsers in Settings."
2015-05-19 17:50:01 +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
Robin Lee
4dda36a220
am 7526238a
: am 196d0543
: Merge "Badge managed WiFi networks" into mnc-dev
...
* commit '7526238a74fe4565a8ed2c29b43e8535650fb4b1':
Badge managed WiFi networks
2015-05-19 13:42:54 +00: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
d234296b96
am c0d07e31
: am b5c48a4c
: Merge "VPN: UI for forgetting disconnected VPNs" into mnc-dev
...
* commit 'c0d07e314a74a3910fee969a55e442f045979ed7':
VPN: UI for forgetting disconnected VPNs
2015-05-19 10:36:51 +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
65e43332cc
am a351cda3
: am a2138a34
: Merge "Add setting to disable assist data (2/2)." into mnc-dev
...
* commit 'a351cda36ef5f3f81e6aadeea9f9dc2b36701faf':
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 05:02:24 +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
aa64ba5550
am 9d2edaf2
: am 6ee5a4d0
: Update Backup/reset UI
...
* commit '9d2edaf2bcd9e2a52e9092e40619d171847e84ee':
Update Backup/reset UI
2015-05-19 01:41:38 +00: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
45268e0b50
am cc753b6a
: am 16a45baf
: Merge "LocationSettings javadoc describes what\'s in the UI" into mnc-dev
...
* commit 'cc753b6a02270ae8b99420977f32221394af370e':
LocationSettings javadoc describes what's in the UI
2015-05-19 01:06:10 +00: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
01451c89e1
am 43e25738
: am 512bb7e2
: Merge "Rename config AP Band for Select AP Band" into mnc-dev
...
* commit '43e257381cb0be46708c5c19922e5d03e9bbb131':
Rename config AP Band for Select AP Band
2015-05-18 21:46:54 +00: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
Sanket Padawe
354708916b
am 2a7a5b8e
: am 7186a47e
: Check for special char when renaming device for Wi-Fi direct.
...
* commit '2a7a5b8e683e4438cdced7c456d05e9d501fa583':
Check for special char when renaming device for Wi-Fi direct.
2015-05-18 21:21:49 +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