Commit Graph

20113 Commits

Author SHA1 Message Date
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
Fabrice Di Meglio
a9af1d262c am 3fc7bfd9: Merge "Fix bug #21025020 Stability: JCs in Settings: Caused by: java.lang.NullPointerException" into mnc-dev
* commit '3fc7bfd9d9a4aa5b89b714ef18385366fde2b946':
  Fix bug #21025020 Stability: JCs in Settings: Caused by: java.lang.NullPointerException
2015-05-14 21:51:07 +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
Amith Yamasani
7ca7645cc0 am fd210786: Fix build
* commit 'fd210786eab8c4aacbbb3aad5a206c57a732d2dc':
  Fix build
2015-05-14 04:48:38 +00:00
Amith Yamasani
fd210786ea Fix build
Change-Id: Id5c76cc0c9ead630d345a4ce173e3e9d141c1af9
2015-05-13 21:37:51 -07:00
Geoff Mendal
bbc090f022 am 78004ec6: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '78004ec621e082e660a53c48ed4c06ed380764c7':
  Import translations. DO NOT MERGE
2015-05-14 04:18:23 +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
Geoff Mendal
e17a11284c am ecac0e55: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit 'ecac0e55906082fd1d1e65554a87625179ba7445':
  Import translations. DO NOT MERGE
2015-05-14 02:43:38 +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
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
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
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
715f89d44e am d7139802: Merge "Start bluetooth scan on screen orientation change." into mnc-dev
* commit 'd713980221f01aeda96337a3158a8f5f1c2d701f':
  Start bluetooth scan on screen orientation change.
2015-05-13 20:11:43 +00: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
c1dc5acfb0 am f1536e4a: Merge "Hide permission related summaries" into mnc-dev
* commit 'f1536e4a1b02055efbe27d963aa7c1df64681783':
  Hide permission related summaries
2015-05-13 19:37:07 +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
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
Chris Wren
0e63a138aa am 0c3d8f1c: Merge "replace temporary metrics categories with permanent ones." into mnc-dev
* commit '0c3d8f1c0f869f5faa4b828e118f8717c8f77d40':
  replace temporary metrics categories with permanent ones.
2015-05-13 18:15:33 +00: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
fe2cee7b2d am e2862a00: Merge "Migrate settings UI to use async security check" into mnc-dev
* commit 'e2862a00b1ce2cf5ec9c3c8402a973c0fe426685':
  Migrate settings UI to use async security check
2015-05-13 17:32:04 +00:00
Jason Monk
2863a9457a am a8dae2af: Merge "Start app notifications as fragment not intent" into mnc-dev
* commit 'a8dae2af5082e1a9c361477cc03bf1da695851b8':
  Start app notifications as fragment not intent
2015-05-13 17:32:04 +00: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
Jason Monk
255452fdf4 Start app notifications as fragment not intent
This lets it show the back arrow when coming from within the settings
app.

Bug: 20561808
Change-Id: I103c8fb74197c5a0530c363a234da5e2148726a7
2015-05-13 11:36:45 -04:00
Xiyuan Xia
bf9ac6b4fb Migrate settings UI to use async security check
Bug: 20697812
Change-Id: Ieb0090ddb61198a60abb1e34ff9c6e8476c33789
2015-05-13 15:32:45 +00:00
Geoff Mendal
453511fc39 am ec36780b: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit 'ec36780b6aae94d5a23b2f635bd3ba811aef6ae0':
  Import translations. DO NOT MERGE
2015-05-13 15:12:38 +00:00
Jason Monk
417c9b4625 am 02f0a4af: Fix connecting to secure wifi from QS
* commit '02f0a4aff3349513e69ea6697151c60088f75dcd':
  Fix connecting to secure wifi from QS
2015-05-13 15:12:35 +00:00
Geoff Mendal
ec36780b6a Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-05-13 14:41:28 +00: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
Jason Monk
02f0a4aff3 Fix connecting to secure wifi from QS
Sometimes the preference isn't created yet, so we need to hold on
to the ssid until the preference for that access point gets created.

Bug: 20975085
Change-Id: Ib5804611793550106f6059b1afe016de4e89bc64
2015-05-13 10:17:33 -04:00