Commit Graph

7484 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Geoff Mendal
011949c6aa Import translations. DO NOT MERGE
Change-Id: I5a8416a5469b2c88197e0592ea660f38d7db233c
Auto-generated-cl: translation import
2015-05-13 07:34:45 -07:00
Alan Viverette
1e3f220b7d am bdc4e534: Memory icon should use theme accent color as tint
* commit 'bdc4e534ba2bbd5bc04f1046e5199251d54a9599':
  Memory icon should use theme accent color as tint
2015-05-12 21:15:49 +00:00
Alan Viverette
bdc4e534ba Memory icon should use theme accent color as tint
Change-Id: I9d338680db7df437ab87d66dcfd9ca23441a4f58
2015-05-12 14:04:47 -07:00
Jason Monk
c51c98485c am ce57d168: Merge "More updates to battery optimization whitelist" into mnc-dev
* commit 'ce57d168624b6b10b235cb41374e862cca25a1f3':
  More updates to battery optimization whitelist
2015-05-12 20:17:39 +00:00
Jason Monk
ce57d16862 Merge "More updates to battery optimization whitelist" into mnc-dev 2015-05-12 20:05:27 +00:00
Jason Monk
3bdb0d690e More updates to battery optimization whitelist
Mostly just string updates.

Also fix crash in power details.

Bug: 19991702
Bug: 21027488
Bug: 21063077
Change-Id: I5a5e382a20ffaecd9eb16454906c985cc1510572
2015-05-12 15:55:23 -04:00
Jason Monk
70ac19f803 am bb8f6e60: Merge "App info > storage updates" into mnc-dev
* commit 'bb8f6e606ab78783354cb8b8948b9bde7250446a':
  App info > storage updates
2015-05-12 19:32:15 +00:00
Jason Monk
bb8f6e606a Merge "App info > storage updates" into mnc-dev 2015-05-12 19:20:38 +00:00
Jason Monk
c27f9e179a App info > storage updates
- Fix button theme
 - Hide move dropdown when can't move
 - Cleanup by switching to using a horizontal preference layout, rather
   than custom layouts

Bug: 21060534
Change-Id: I2cc3ab4063ff6b4dfe873f9152b34130d702faae
2015-05-12 14:58:09 -04:00
Maurice Lam
f51a17e6d2 am c988100c: Merge "[WifiSetup] Use adjustResize for alert dialogs during Setup" into mnc-dev
* commit 'c988100c6e8c2f7eb1fb4133241132b91a987d81':
  [WifiSetup] Use adjustResize for alert dialogs during Setup
2015-05-12 18:10:11 +00:00
Maurice Lam
c988100c6e Merge "[WifiSetup] Use adjustResize for alert dialogs during Setup" into mnc-dev 2015-05-12 18:03:35 +00:00
Sanket Padawe
b212629d92 Hotspot 2.0 UI for saved network.
Bug: 20182930
Change-Id: I455773f446dad323ed9cb559c2f2d69ca53af46c
2015-05-12 10:26:43 -07:00
Jason Monk
775cb866ec am ee1a06ee: Fix tuner key
* commit 'ee1a06eee3ba73c0382332eae98a14fbacffa352':
  Fix tuner key
2015-05-12 15:14:25 +00:00
Jason Monk
b7ec58fbd4 am 41f47bbc: Merge "Add SystemUI Tuner Control" into mnc-dev
* commit '41f47bbcb301ebdf27069ccb76395d303bf17144':
  Add SystemUI Tuner Control
2015-05-12 15:14:23 +00:00
Jason Monk
ee1a06eee3 Fix tuner key
Change-Id: I4bddf218dc34516134bd190ebf8c0f1c7b1a6544
2015-05-12 11:10:52 -04:00
Jason Monk
41f47bbcb3 Merge "Add SystemUI Tuner Control" into mnc-dev 2015-05-12 15:03:41 +00:00
Jason Monk
49851ac32a Add SystemUI Tuner Control
Change-Id: I321c3263612c752409beb46f4c96826954b96e26
2015-05-12 11:01:17 -04:00