Commit Graph

23420 Commits

Author SHA1 Message Date
Jim Miller
e9785ac1e4 Postpone call to postEnroll() until we actually leave activity.
The existing code was calling postEnroll() too soon, which resulted
in the inability to add more than one fingerprint. The solution is to
only call postEnroll() when we're leaving the activity.

Fixes bug 22438498

Change-Id: Ia134899e12b4edc9cced834e99cb2bfd2d51321f
2015-07-13 16:00:25 -07:00
Maurice Lam
a251126974 am 39f92c0f: am c6178ba0: Merge "[Fingerprint] Export FingerprintEnrollIntroduction" into mnc-dr-dev
* commit '39f92c0f54f40bacff42d24d02431ba6744cf2d5':
  [Fingerprint] Export FingerprintEnrollIntroduction
2015-07-13 22:48:25 +00:00
Maurice Lam
39f92c0f54 am c6178ba0: Merge "[Fingerprint] Export FingerprintEnrollIntroduction" into mnc-dr-dev
* commit 'c6178ba01236b60e90cc993103c633ea7eca299d':
  [Fingerprint] Export FingerprintEnrollIntroduction
2015-07-13 22:34:42 +00:00
Billy Lau
7f70ba18e6 Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW and WRITE_SETTINGS permission to an
explicit toggle to be enabled through Settings via Apps -> Advanced Apps.

Added new and refactored an old xml to define the UX for two new Preferences
in Advanced Settings. Modified the existing AdvancedAppSettings to add
control flow for two new settings. Also enriched ManageApplications to
handle these cases. Added additional strings in xml/values/strings.xml
to support these settings. Also defined new classes to handle these the
toggle of these permissions per app.

Refactored codes from AppStateUsageBridge to a generic AppStateAppOpsBridge so
that future usages related to AppOps can inherit from this class.

Change-Id: I43b81282a063e05844c7805556a6d05cfc02bcdb
2015-07-13 22:39:49 +01:00
Maurice Lam
c6178ba012 Merge "[Fingerprint] Export FingerprintEnrollIntroduction" into mnc-dr-dev 2015-07-13 20:20:57 +00:00
Jason Monk
26cc9fcf66 Disable notification volume when user restricted
Bug: 22327825
Change-Id: I892627e00d9ebe2cd67348ce6da3c9c7bc0251fc
2015-07-13 15:15:36 -04:00
Wei Liu
de557d48ba Move AppItem, ChartData, ChartDataLoader from Settings to SettingsLib.
Change-Id: Id6189e600eb2adb67f31d079a5a5ecfc99addccc
2015-07-13 12:01:42 -07:00
Jason Monk
34e7b4cd05 am 53dd1d4d: Merge "Fix app icon size" into mnc-dev
* commit '53dd1d4deea9968f1255018248ff0393252032dd':
  Fix app icon size
2015-07-13 18:12:35 +00:00
Jason Monk
53dd1d4dee Merge "Fix app icon size" into mnc-dev 2015-07-13 18:05:54 +00:00
Sanket Padawe
c319bac558 am 7995ca41: Use same technology type for LTE/4G
* commit '7995ca4165cae43b9bff25a6e6eafdb51445b698':
  Use same technology type for LTE/4G
2015-07-13 17:36:19 +00:00
Sanket Padawe
7995ca4165 Use same technology type for LTE/4G
Though status bar and preferred network type show 4G, still show
LTE in SIM status when device set config_show4GForLTE true

Bug: 22213113
Change-Id: I2866a868992af7b4eb661d693a0cce60bb1b3402
2015-07-13 10:15:41 -07:00
Chris Wren
ae15849d11 am 2f8bb8ea: Merge "import new view enums into MetricsLogger" into mnc-dev
* commit '2f8bb8ea97e87cacbe307c1d78fa7a6e096530eb':
  import new view enums into MetricsLogger
2015-07-13 16:32:11 +00:00
Chris Wren
2f8bb8ea97 Merge "import new view enums into MetricsLogger" into mnc-dev 2015-07-13 16:21:26 +00:00
Jason Monk
061c8af3d6 Fix app icon size
Bug: 22425103
Change-Id: I35b3476eb75d221e5f244702534d4475b2c5921e
2015-07-13 12:18:43 -04:00
Geoff Mendal
b59ef5ad39 am b785dfae: (-s ours) am cc95aedc: (-s ours) am c2175d78: (-s ours) am a52bf201: (-s ours) Import translations. DO NOT MERGE
* commit 'b785dfae7e96581d16ccf0427644cb61e0fb81bb':
  Import translations. DO NOT MERGE
2015-07-13 15:50:40 +00:00
Geoff Mendal
905c79105b am 567c3a03: (-s ours) am 5fb58ffc: (-s ours) am b30eaa84: (-s ours) am 7174a3d7: (-s ours) Import translations. DO NOT MERGE
* commit '567c3a030d796f401981f62d4432b8d5c963e4c8':
  Import translations. DO NOT MERGE
2015-07-13 15:50:39 +00:00
Geoff Mendal
b785dfae7e am cc95aedc: (-s ours) am c2175d78: (-s ours) am a52bf201: (-s ours) Import translations. DO NOT MERGE
* commit 'cc95aedca49c204a4b6c25cd3e4682d09d2dcaf6':
  Import translations. DO NOT MERGE
2015-07-13 15:36:22 +00:00
Geoff Mendal
567c3a030d am 5fb58ffc: (-s ours) am b30eaa84: (-s ours) am 7174a3d7: (-s ours) Import translations. DO NOT MERGE
* commit '5fb58ffc5e419d091472697e82cf7e0e7e4de833':
  Import translations. DO NOT MERGE
2015-07-13 15:36:21 +00:00
Geoff Mendal
cc95aedca4 am c2175d78: (-s ours) am a52bf201: (-s ours) Import translations. DO NOT MERGE
* commit 'c2175d78421d1f35a53a37e37bd97150a900bf37':
  Import translations. DO NOT MERGE
2015-07-13 15:25:36 +00:00
Geoff Mendal
5fb58ffc5e am b30eaa84: (-s ours) am 7174a3d7: (-s ours) Import translations. DO NOT MERGE
* commit 'b30eaa843c0fb31df2b7157c05ad7d01d3e0d35e':
  Import translations. DO NOT MERGE
2015-07-13 15:25:35 +00:00
Geoff Mendal
c2175d7842 am a52bf201: (-s ours) Import translations. DO NOT MERGE
* commit 'a52bf2017292a6da41d9b6950a1564710a94367e':
  Import translations. DO NOT MERGE
2015-07-13 15:11:43 +00:00
Geoff Mendal
b30eaa843c am 7174a3d7: (-s ours) Import translations. DO NOT MERGE
* commit '7174a3d7011fa4456bebe7e7b55f47aaed013d29':
  Import translations. DO NOT MERGE
2015-07-13 15:10:40 +00:00
Geoff Mendal
a52bf20172 Import translations. DO NOT MERGE
Change-Id: I75a6759a8ccd3a922121912e0c2bdb291fda3e56
Auto-generated-cl: translation import
2015-07-13 07:08:00 -07:00
Geoff Mendal
329cea489b am 536ed184: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '536ed1847863776335576699cdbe828b62f35a0f':
  Import translations. DO NOT MERGE
2015-07-13 14:05:58 +00:00
Geoff Mendal
536ed18478 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-07-13 13:54:00 +00:00
Geoff Mendal
a0838470f3 Import translations. DO NOT MERGE
Change-Id: Ice9d7f5cfe191a669657298432c0ecfae0f438bb
Auto-generated-cl: translation import
2015-07-13 06:53:26 -07:00
Zoltan Szatmary-Ban
30a73372c4 am 098c296d: Merge "Do not throw exception when MeasurementDetails.mediaSize is empty" into mnc-dev
* commit '098c296df2388bbcc906e8e149743eea7467b0a8':
  Do not throw exception when MeasurementDetails.mediaSize is empty
2015-07-13 13:20:30 +00:00
Zoltan Szatmary-Ban
098c296df2 Merge "Do not throw exception when MeasurementDetails.mediaSize is empty" into mnc-dev 2015-07-13 13:09:54 +00:00
Geoff Mendal
15069c82b4 Import translations. DO NOT MERGE
Change-Id: I44582b10dbf32b9feb774da997c56795303499d4
Auto-generated-cl: translation import
2015-07-13 06:04:46 -07:00
Zoltan Szatmary-Ban
706e7014d8 Do not throw exception when MeasurementDetails.mediaSize is empty
It is legitimate for StorageMeasurement.measureExactStorage to return without any user keys
added to the returned MeasurementDetails, when the following is true:

mVolume == null || !mVolume.isMountedReadable()

Bug: 22394495
Change-Id: Ie40bd468a487208d98dc56aae41fdad7098f41a5
2015-07-13 12:37:31 +01:00
Geoff Mendal
88afe4a4d7 am da15ade8: (-s ours) Import translations. DO NOT MERGE
* commit 'da15ade8300bb875b8d874e1f68032f6ffe95719':
  Import translations. DO NOT MERGE
2015-07-13 07:21:27 +00:00
Geoff Mendal
7174a3d701 Import translations. DO NOT MERGE
Change-Id: I73a807d112306b787b9975ee0c2560a2431f031b
Auto-generated-cl: translation import
2015-07-11 13:37:38 -05:00
Geoff Mendal
da15ade830 Import translations. DO NOT MERGE
Change-Id: Ib1f4051b1001de52b74483fc18eaf909e656de67
Auto-generated-cl: translation import
2015-07-11 06:59:16 -07:00
Geoff Mendal
2eb61989eb Import translations. DO NOT MERGE
Change-Id: I9c48ee964f67f56f9996cb44262a05d0c75cf463
Auto-generated-cl: translation import
2015-07-11 06:11:22 -07:00
Maurice Lam
052297172e [Fingerprint] Export FingerprintEnrollIntroduction
Export FingerprintEnrollIntroduction activity under the permission
USE_FINGERPRINT so that setup wizard can start it.

Bug: 21695577
Change-Id: If466c6e484a4aa0c10382cfedab0aad10ae26702
2015-07-10 21:00:02 -07:00
Chris Wren
ef94267afd import new view enums into MetricsLogger
Bug: 21114836
Change-Id: I9a6e00ab8d85726ca6505a28ca7a52aef5aa1e1a
2015-07-10 17:19:58 -04:00
Robin Lee
4e3635d8db am 722d5e22: am be638020: am 719cbc4a: am d3b6832e: am 7ba46433: Merge "Match getLegacyVpn calls to changed interface" into mnc-dev
* commit '722d5e221aef34220f0e6be874f62b14b7dea13f':
  Match getLegacyVpn calls to changed interface
2015-07-10 20:09:32 +00:00
Robin Lee
722d5e221a am be638020: am 719cbc4a: am d3b6832e: am 7ba46433: Merge "Match getLegacyVpn calls to changed interface" into mnc-dev
* commit 'be638020e55c29b0b283713fb42c9866960b5755':
  Match getLegacyVpn calls to changed interface
2015-07-10 19:55:12 +00:00
Rubin Xu
46175909ed am 6e2c1c2e: am bd2e045e: am a383b02c: am 8b9a9519: am 331b9823: Merge "Remove unused MediaFormat activity" into mnc-dev
* commit '6e2c1c2e68f6ff40c7201550446e29c8411154b7':
  Remove unused MediaFormat activity
2015-07-10 19:47:04 +00:00
Jason Monk
9b8bfc56bc am d5c8980a: am 8b35321f: am 93623850: am c07450ae: am 7ab3cf94: Merge "Fix wifi not re-ordering" into mnc-dev
* commit 'd5c8980a3b270ed9ebad365773417f9338252ef0':
  Fix wifi not re-ordering
2015-07-10 19:47:03 +00:00
Robin Lee
be638020e5 am 719cbc4a: am d3b6832e: am 7ba46433: Merge "Match getLegacyVpn calls to changed interface" into mnc-dev
* commit '719cbc4acfe01d3aaf0dfb1061c06b69b7db2d29':
  Match getLegacyVpn calls to changed interface
2015-07-10 19:41:01 +00:00
Rubin Xu
6e2c1c2e68 am bd2e045e: am a383b02c: am 8b9a9519: am 331b9823: Merge "Remove unused MediaFormat activity" into mnc-dev
* commit 'bd2e045e177c831925653ee43b18196c130e22e3':
  Remove unused MediaFormat activity
2015-07-10 19:33:00 +00:00
Jason Monk
d5c8980a3b am 8b35321f: am 93623850: am c07450ae: am 7ab3cf94: Merge "Fix wifi not re-ordering" into mnc-dev
* commit '8b35321fa288bf6ef61099d0ed0f48956f979807':
  Fix wifi not re-ordering
2015-07-10 19:32:58 +00:00
Robin Lee
719cbc4acf am d3b6832e: am 7ba46433: Merge "Match getLegacyVpn calls to changed interface" into mnc-dev
* commit 'd3b6832edb5530b23132e054135c7fe93f5f9384':
  Match getLegacyVpn calls to changed interface
2015-07-10 19:26:09 +00:00
Rubin Xu
bd2e045e17 am a383b02c: am 8b9a9519: am 331b9823: Merge "Remove unused MediaFormat activity" into mnc-dev
* commit 'a383b02c431de7b68f8f913ecfeca9f0051122fe':
  Remove unused MediaFormat activity
2015-07-10 19:26:09 +00:00
Jason Monk
8b35321fa2 am 93623850: am c07450ae: am 7ab3cf94: Merge "Fix wifi not re-ordering" into mnc-dev
* commit '9362385095374cc40cc4549d16e913831e9f14d9':
  Fix wifi not re-ordering
2015-07-10 19:18:01 +00:00
Robin Lee
27c45eb9f2 am 7ba46433: Merge "Match getLegacyVpn calls to changed interface" into mnc-dev
* commit '7ba46433aefad363a1d2e75d4a12f2886c6d0315':
  Match getLegacyVpn calls to changed interface
2015-07-10 19:16:59 +00:00
Robin Lee
d3b6832edb am 7ba46433: Merge "Match getLegacyVpn calls to changed interface" into mnc-dev
* commit '7ba46433aefad363a1d2e75d4a12f2886c6d0315':
  Match getLegacyVpn calls to changed interface
2015-07-10 19:16:57 +00:00
Rubin Xu
a383b02c43 am 8b9a9519: am 331b9823: Merge "Remove unused MediaFormat activity" into mnc-dev
* commit '8b9a9519c865d73ce10a5847b3b99b3cd339114e':
  Remove unused MediaFormat activity
2015-07-10 19:16:48 +00:00
Robin Lee
7ba46433ae Merge "Match getLegacyVpn calls to changed interface" into mnc-dev 2015-07-10 19:05:41 +00:00