Commit Graph

8586 Commits

Author SHA1 Message Date
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
Fabrice Di Meglio
41f6869a8c am a9af1d26: am 3fc7bfd9: Merge "Fix bug #21025020 Stability: JCs in Settings: Caused by: java.lang.NullPointerException" into mnc-dev
* commit 'a9af1d262cbf5c26a57b4028d57b4053c29fdce6':
  Fix bug #21025020 Stability: JCs in Settings: Caused by: java.lang.NullPointerException
2015-05-14 22:01:52 +00:00
Fabrice Di Meglio
3fc7bfd9d9 Merge "Fix bug #21025020 Stability: JCs in Settings: Caused by: java.lang.NullPointerException" into mnc-dev 2015-05-14 21:40:53 +00:00
Fabrice Di Meglio
ae35e0c013 Fix bug #21025020 Stability: JCs in Settings: Caused by: java.lang.NullPointerException
- prevent the NPE

Change-Id: Ief5a618e789e50eebcaa4386bd9ecec2192b4565
2015-05-14 14:31:41 -07:00
Nicolas Prevot
ea5677e1a3 Remove the check hasMultipleUsers in Settings.
When deciding to show the user section or not, Just rely
on supportsMultipleUsers. Don't check hasMultipleUsers.

BUG:21119929
Change-Id: Ifbddac10e2f6dc02b8e2e55b41ab9f5be018dfca
2015-05-14 13:02:14 -07:00
Nicolas Prevot
36940543e9 Remove the check hasMultipleUsers in Settings.
When deciding to show the user section or not, Just rely
on supportsMultipleUsers. Don't check hasMultipleUsers.

BUG:21119929
Change-Id: Ifbddac10e2f6dc02b8e2e55b41ab9f5be018dfca
2015-05-14 10:50:27 -07:00
Amith Yamasani
1e37bb877c am 7ca7645c: am fd210786: Fix build
* commit '7ca7645cc0494e047a4b831a3877d4b4c81acaa9':
  Fix build
2015-05-14 06:40:07 +00:00
Amith Yamasani
0b8864effd am 2fcfcd4f: am 0327d483: Merge "Developer settings screen for inactive apps" into mnc-dev
* commit '2fcfcd4f1db03e0052f479597c7359d0071d4ac4':
  Developer settings screen for inactive apps
2015-05-14 06:39:43 +00:00
Sanket Padawe
ec42233484 am 0c3ce4e4: am b331c393: Merge "Hotspot 2.0 UI for saved network." into mnc-dev
* commit '0c3ce4e4bd503af6f48cb7b109c1301efc149c47':
  Hotspot 2.0 UI for saved network.
2015-05-14 06:38:08 +00:00
Amith Yamasani
fd210786ea Fix build
Change-Id: Id5c76cc0c9ead630d345a4ce173e3e9d141c1af9
2015-05-13 21:37:51 -07:00
Amith Yamasani
0327d48306 Merge "Developer settings screen for inactive apps" into mnc-dev 2015-05-14 04:04:55 +00:00
Sanket Padawe
b331c3937d Merge "Hotspot 2.0 UI for saved network." into mnc-dev 2015-05-14 02:40:40 +00:00
Amith Yamasani
50e32b0db0 Developer settings screen for inactive apps
Show a list of apps and allow toggling their active state.

Bug: 20066058
Change-Id: Id81e95c354a579773d39d3e7d7cfa1ff46df29e9
2015-05-13 18:23:20 -07:00
Svet Ganov
afadcacfa0 am 9c083c55: am f96bcb41: Merge "Access mock location is no longer a runtime permission - settings" into mnc-dev
* commit '9c083c5597d4096e48a0202d2a0682d56951d78f':
  Access mock location is no longer a runtime permission - settings
2015-05-14 00:43:27 +00:00
Zoltan Szatmary-Ban
1a2aa9942f Reflect Wifi config lockdown restriction in Settings
DO created WiFi configurations are now only locked down
for editing/removing if DISALLOW_CONFIG_WIFI is not set.
This needed to be reflected on Settings UI.

Bug: 20719934
Change-Id: Ibd218821ab46cca8396084e2d73ae5ee00b584b3
2015-05-14 01:40:48 +01:00
Svet Ganov
f96bcb41cb Merge "Access mock location is no longer a runtime permission - settings" into mnc-dev 2015-05-13 23:45:40 +00:00
Nick Kralevich
2b4046b8e5 am 7f5d86be: am a7791754: Merge "New UI for controlling USB" into mnc-dev
* commit '7f5d86be2a0b29f8739ebca1d20c1a8beb7b5c7d':
  New UI for controlling USB
2015-05-13 22:52:09 +00:00