The Android Automerger
a4fe6d50c9
merge in mnc-release history after reset to mnc-dev
2015-05-19 01:03:45 -07: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
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
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
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
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
11b29e7613
Merge "Initial pass at storage benchmarks." into mnc-dev
2015-05-15 21:56:01 +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
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
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
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
68d208e903
Merge "Fix crash when removing fingerprint" into mnc-dev
2015-05-14 22:12:38 +00:00
Fabrice Di Meglio
6995fee9aa
Fix bug #21025020 Stability: JCs in Settings: Caused by: java.lang.NullPointerException
...
- prevent the NPE
Change-Id: Ief5a618e789e50eebcaa4386bd9ecec2192b4565
2015-05-14 14:48:41 -07: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
Amith Yamasani
fd210786ea
Fix build
...
Change-Id: Id5c76cc0c9ead630d345a4ce173e3e9d141c1af9
2015-05-13 21:37:51 -07:00
Geoff Mendal
78004ec621
Merge "Import translations. DO NOT MERGE" into mnc-dev
2015-05-14 04:14:08 +00:00
Geoff Mendal
07803c0bfe
Import translations. DO NOT MERGE
...
Change-Id: Ia831500abc9de4dd293c116e0a81f4bcccad0672
Auto-generated-cl: translation import
2015-05-13 21:12:10 -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
Geoff Mendal
ecac0e5590
Merge "Import translations. DO NOT MERGE" into mnc-dev
2015-05-14 02:35:42 +00:00
Geoff Mendal
1760c0a34d
Import translations. DO NOT MERGE
...
Change-Id: I9ef3b09a81c284f0bdeb0493ce73616d10fca3c3
Auto-generated-cl: translation import
2015-05-13 19:27:55 -07: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
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
Svet Ganov
02e65a181a
Access mock location is no longer a runtime permission - settings
...
The access mock location is no longer a runtime permission. It is a
signature protected one that apps cannot get but the fact they request
it means they want to inject location into the system. Now the user
gets to choose the current mock location app in developer options from
the apps that request the mock location permission. The access to mock
location is no longer guarded by the permisson but from a new app op
which is off by default and the settiings UI sets it to enabled only
for the currently selected mock location app.
bug:21078873
Change-Id: I6555179ecf0cc37d9bb857e9dfb3b04c091ea612
2015-05-13 15:45:03 -07:00
Nick Kralevich
a779175466
Merge "New UI for controlling USB" into mnc-dev
2015-05-13 22:32:15 +00:00
Nick Kralevich
7000d54338
New UI for controlling USB
...
Create a new UI for managing USB access control. This UI is implemented
as a transparent popup triggered by a persistent notification.
Delete the old UI for controlling this. It is no longer used.
Bug: 18905620
Change-Id: I54186961414447a9d37f68e946e1c167506170ae
2015-05-13 15:23:52 -07:00
Jorim Jaggi
0dbeeda053
Fix crash when removing fingerprint
...
Also fix a strings in fingerprint enrollment.
Bug: 21030545
Change-Id: I2d250b51a01f02bee014d4bc8e192d11199113e3
2015-05-13 14:14:05 -07:00
Sanket Padawe
d713980221
Merge "Start bluetooth scan on screen orientation change." into mnc-dev
2015-05-13 20:00:13 +00:00
Jason Monk
f1536e4a1b
Merge "Hide permission related summaries" into mnc-dev
2015-05-13 19:22:47 +00:00
Jason Monk
63a819aa35
Hide permission related summaries
...
We need to get this data from the PackageInstaller directly, in the
mean time hide the summaries since they are incorrect.
Bug: 21078474
Change-Id: I1c1b50ee6806cfbf16830fbff5bf8ffae344451a
2015-05-13 15:19:57 -04:00
John Spurlock
07851208fc
Merge "Settings: New string for zen messages summary." into mnc-dev
2015-05-13 19:07:51 +00:00
John Spurlock
fcfcb5ddc4
Settings: New string for zen messages summary.
...
Bug: 20064962
Change-Id: Ie39ee78b2ec351f6b41ad5584af44966efb2a3aa
2015-05-13 15:02:58 -04:00
Jason Monk
78161c7375
Merge "Add additional permissions button to manage perms" into mnc-dev
2015-05-13 18:40:51 +00:00
Jason Monk
c25f11889c
Add additional permissions button to manage perms
...
Bug: 20269176
Change-Id: Ic004204b0fd984717a6d3848e8295edc67047883
2015-05-13 14:40:02 -04:00
Chris Wren
0c3d8f1c0f
Merge "replace temporary metrics categories with permanent ones." into mnc-dev
2015-05-13 18:06:00 +00:00
Chris Wren
8b7dc08e77
replace temporary metrics categories with permanent ones.
...
Bug: 21114836
Change-Id: I05ca033e2e15fc1ae4330453bbe50aaa6cd1ea6c
2015-05-13 13:44:36 -04:00
Xiyuan Xia
e2862a00b1
Merge "Migrate settings UI to use async security check" into mnc-dev
2015-05-13 17:21:00 +00:00
Jason Monk
a8dae2af50
Merge "Start app notifications as fragment not intent" into mnc-dev
2015-05-13 15:40:08 +00:00