Svet Ganov
7607ab8262
am 9027bc2f: am 9a3ad8a3: am 67e067ff: Hide platform platform legacy permissions behind a menu option - settings.
...
* commit '9027bc2f2dbdf1763238843cc7098eafb04c56d0':
Hide platform platform legacy permissions behind a menu option - settings.
2015-05-17 11:49:09 +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
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
Jason Monk
ec90a59413
am 70842a4e: am 1f7861b6: am 0c0e35ef: Banish the memory page to Apps > Advanced
...
* commit '70842a4e3b5160df0dd496e909e19516ec09e406':
Banish the memory page to Apps > Advanced
2015-05-15 16:57:13 +00:00
Jason Monk
70842a4e3b
am 1f7861b6: am 0c0e35ef: Banish the memory page to Apps > Advanced
...
* commit '1f7861b608e49c3336ffe14a074063559e0e0aa7':
Banish the memory page to Apps > Advanced
2015-05-15 16:37:56 +00: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
Matthew Williams
a790557431
am fe5d0d9b: am 8c5d3889: am 5af3d6f5: Add strings for fullbackup data erase confirmation
...
* commit 'fe5d0d9b67ff33f88a924c7231b564bc7d7e7be6':
Add strings for fullbackup data erase confirmation
2015-05-15 02:39:24 +00:00
Matthew Williams
fe5d0d9b67
am 8c5d3889: am 5af3d6f5: Add strings for fullbackup data erase confirmation
...
* commit '8c5d388922812ee1063ab0603f68f8c2e1faecd5':
Add strings for fullbackup data erase confirmation
2015-05-15 02:28:36 +00: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
bf373fddda
am e1fa322d: am 7dc5d2c0: am 68d208e9: Merge "Fix crash when removing fingerprint" into mnc-dev
...
* commit 'e1fa322dec6a179abb48192135cf3ae3c00c1ee6':
Fix crash when removing fingerprint
2015-05-14 22:40:36 +00: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
7dc5d2c044
am 68d208e9: Merge "Fix crash when removing fingerprint" into mnc-dev
...
* commit '68d208e9034a1e547d752a76f67a72680e380d07':
Fix crash when removing fingerprint
2015-05-14 22:20:33 +00:00
Jorim Jaggi
68d208e903
Merge "Fix crash when removing fingerprint" into mnc-dev
2015-05-14 22:12:38 +00:00
Amith Yamasani
6abc73dac9
am 0b8864ef: am 2fcfcd4f: am 0327d483: Merge "Developer settings screen for inactive apps" into mnc-dev
...
* commit '0b8864effdbf24e187e2db21b34f4a3c09c825fe':
Developer settings screen for inactive apps
2015-05-14 06:53:56 +00:00
Sanket Padawe
8378487f48
am ec422334: am 0c3ce4e4: am b331c393: Merge "Hotspot 2.0 UI for saved network." into mnc-dev
...
* commit 'ec42233484d7648f51ffe5c49c51b33beb735b29':
Hotspot 2.0 UI for saved network.
2015-05-14 06:53:55 +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
Geoff Mendal
78004ec621
Merge "Import translations. DO NOT MERGE" into mnc-dev
2015-05-14 04:14:08 +00:00
Amith Yamasani
2fcfcd4f1d
am 0327d483: Merge "Developer settings screen for inactive apps" into mnc-dev
...
* commit '0327d483068e0ae286540e6315e6b32a98fbb41c':
Developer settings screen for inactive apps
2015-05-14 04:14:06 +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
0c3ce4e4bd
am b331c393: Merge "Hotspot 2.0 UI for saved network." into mnc-dev
...
* commit 'b331c3937d07d44354bf882ae0e30e77aef9e875':
Hotspot 2.0 UI for saved network.
2015-05-14 02:43:40 +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
Svet Ganov
8a79a41334
am afadcacf: am 9c083c55: am f96bcb41: Merge "Access mock location is no longer a runtime permission - settings" into mnc-dev
...
* commit 'afadcacfa0b420611cc2108099232e9b953983b1':
Access mock location is no longer a runtime permission - settings
2015-05-14 00:56:15 +00: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
Svet Ganov
9c083c5597
am f96bcb41: Merge "Access mock location is no longer a runtime permission - settings" into mnc-dev
...
* commit 'f96bcb41cb62febdf3ce5d8e6f9cceb3ecc7f403':
Access mock location is no longer a runtime permission - settings
2015-05-14 00:00:40 +00: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
ebe774d921
am 2b4046b8: am 7f5d86be: am a7791754: Merge "New UI for controlling USB" into mnc-dev
...
* commit '2b4046b8e5741bf58617971a825422c535330ecd':
New UI for controlling USB
2015-05-13 22:58:42 +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
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
7f5d86be2a
am a7791754: Merge "New UI for controlling USB" into mnc-dev
...
* commit 'a779175466df47dc15366af9fcd1d4fcacd11318':
New UI for controlling USB
2015-05-13 22:40:13 +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
Robert Greenwalt
c516a28cb5
am 8fc345fb: am a1a2c91b: Merge "Remove phone information for a secondary user"
...
* commit '8fc345fb2e64ff916432a445fb4bc5f4e314cb32':
Remove phone information for a secondary user
2015-05-13 22:00:26 +00:00
Robert Greenwalt
8fc345fb2e
am a1a2c91b: Merge "Remove phone information for a secondary user"
...
* commit 'a1a2c91b7d1ad950a8636aaa029077b9e6e81aed':
Remove phone information for a secondary user
2015-05-13 21:43:39 +00:00
Robert Greenwalt
a1a2c91b7d
Merge "Remove phone information for a secondary user"
2015-05-13 21:20:51 +00: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
John Spurlock
c6b97b7098
am 91ab24ed: am fad62c47: am 07851208: Merge "Settings: New string for zen messages summary." into mnc-dev
...
* commit '91ab24ed3b01cda0104352bcaa6cf89b42caa5e8':
Settings: New string for zen messages summary.
2015-05-13 19:39:25 +00:00
Jason Monk
d40954e200
am 5fd31256: am 3a6561ca: am 78161c73: Merge "Add additional permissions button to manage perms" into mnc-dev
...
* commit '5fd31256a9d323f11a2ecfd741018923b8aa3b59':
Add additional permissions button to manage perms
2015-05-13 19:28:45 +00:00
John Spurlock
fad62c4726
am 07851208: Merge "Settings: New string for zen messages summary." into mnc-dev
...
* commit '07851208fc43afb343085bbfc9fbab6741d8bb03':
Settings: New string for zen messages summary.
2015-05-13 19:16:08 +00: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
3a6561ca41
am 78161c73: Merge "Add additional permissions button to manage perms" into mnc-dev
...
* commit '78161c737557cdfea30e6ac3e06be75db72b1cd8':
Add additional permissions button to manage perms
2015-05-13 18:54:47 +00: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