Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
21,194 Commits 1 Branch 0 Tags
bc99d35e38b83c7f7a19fd2bf591c15618d6161a
Commit Graph

8752 Commits

Author SHA1 Message Date
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
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
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
Jorim Jaggi
712530794b Follow up for I8050df3177b6d540829c3f0989a4e4b1381c87ec (2/2) 
Change-Id: I7623488349209248596827d03fd77cd128f8b2b4
 2015-05-19 14:02:05 -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
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
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
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
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
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
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
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
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
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
b50875d915 am 6dbb9ff0: am bbf031ab: Merge "Try not to crash while AppInfo is finishing" into mnc-dev 
* commit '6dbb9ff05969e708c25ef1af9ba45e23c6a51afe':
  Try not to crash while AppInfo is finishing
 2015-05-18 13:47:17 +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
Svet Ganov
9027bc2f2d am 9a3ad8a3: am 67e067ff: Hide platform platform legacy permissions behind a menu option - settings. 
* commit '9a3ad8a36bd7eb7453f532746aa92189404df01a':
  Hide platform platform legacy permissions behind a menu option - settings.
 2015-05-17 11:40:15 +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
Jeff Sharkey
47b3d7c6f5 am 1661f00a: am 11b29e76: Merge "Initial pass at storage benchmarks." into mnc-dev 
* commit '1661f00ae06aa773a0c308a558fd44bc7b1db877':
  Initial pass at storage benchmarks.
 2015-05-15 22:22:22 +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
a5ddfd4b6d am eba12083: am cb5444ad: Merge "Reflect Wifi config lockdown restriction in Settings" into mnc-dev 
* commit 'eba12083bf3cced3d0f9c75efcc96fd130314a5f':
  Reflect Wifi config lockdown restriction in Settings
 2015-05-15 20:43:56 +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
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
Svet Ganov
588faa3353 am def90c56: am 3bd7db9f: Merge "Fix a typo." into mnc-dev 
* commit 'def90c568c5787a83052554bc8c0ed7e00896fee':
  Fix a typo.
 2015-05-14 23:54:50 +00:00
Svet Ganov
3bd7db9f85 Merge "Fix a typo." into mnc-dev 2015-05-14 23:29:27 +00:00
Svet Ganov
280e59f1fb Fix a typo. 
Change-Id: I38855b1f83d2524ff76b78a3109f18e128d803e1
 2015-05-14 16:27:51 -07:00
Jorim Jaggi
e1fa322dec am 7dc5d2c0: am 68d208e9: Merge "Fix crash when removing fingerprint" into mnc-dev 
* commit '7dc5d2c044e07730784a5897e74ea6e696a43bbc':
  Fix crash when removing fingerprint
 2015-05-14 22:28:27 +00:00
Jorim Jaggi
68d208e903 Merge "Fix crash when removing fingerprint" into mnc-dev 2015-05-14 22:12:38 +00:00