PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
24,388 Commits 1 Branch 0 Tags
c7f02876cd74151178b7e15b69bf3f757ffa3e37
Commit Graph

10185 Commits

Author SHA1 Message Date
Martijn Coenen
90d21f0967 am 8d9bb1ae: Merge "Fix up Tap and Pay how it works." into mnc-dev 
* commit '8d9bb1ae1d551699ba85061001ced90a157ae9ad':
  Fix up Tap and Pay how it works.
 2015-07-14 07:57:35 +00:00
Martijn Coenen
35738049df am 8d9bb1ae: Merge "Fix up Tap and Pay how it works." into mnc-dev 
* commit '8d9bb1ae1d551699ba85061001ced90a157ae9ad':
  Fix up Tap and Pay how it works.
 2015-07-14 07:57:35 +00:00
Martijn Coenen
8d9bb1ae1d Merge "Fix up Tap and Pay how it works." into mnc-dev 2015-07-14 07:45:01 +00:00
Jorim Jaggi
0798ef0523 Disable voice input if assist is voice service 
Bug: 22358252
Change-Id: Id4a9de8c5287c5e025d0ccc7f98edd8855db519c
 2015-07-14 04:13:57 +00:00
Maurice Lam
48b11b8158 am 49e0b9fd: am a2511269: am 39f92c0f: am c6178ba0: Merge "[Fingerprint] Export FingerprintEnrollIntroduction" into mnc-dr-dev 
* commit '49e0b9fdff9741f51e69683b2f79b6079d344a67':
  [Fingerprint] Export FingerprintEnrollIntroduction
 2015-07-14 00:25:35 +00:00
Maurice Lam
49e0b9fdff am a2511269: am 39f92c0f: am c6178ba0: Merge "[Fingerprint] Export FingerprintEnrollIntroduction" into mnc-dr-dev 
* commit 'a2511269745c7d8ae101996d02905fbed3c5bfe7':
  [Fingerprint] Export FingerprintEnrollIntroduction
 2015-07-13 23:50:34 +00:00
Sanket Padawe
389fbb748c am 2db9291e: am 7995ca41: Use same technology type for LTE/4G 
* commit '2db9291ea4ba1d880ebcc976c65b12dd24d080ad':
  Use same technology type for LTE/4G
 2015-07-13 23:34:48 +00:00
Chris Wren
209a72cab1 am b6d8b5f6: am 2f8bb8ea: Merge "import new view enums into MetricsLogger" into mnc-dev 
* commit 'b6d8b5f6a4dfd5838f9e35d9ddd840e80f5bfec6':
  import new view enums into MetricsLogger
 2015-07-13 23:34:47 +00:00
Zoltan Szatmary-Ban
e4e520641d am c968c407: am 098c296d: Merge "Do not throw exception when MeasurementDetails.mediaSize is empty" into mnc-dev 
* commit 'c968c407f809f06dda02dffe25ea2a4ee9f4cb15':
  Do not throw exception when MeasurementDetails.mediaSize is empty
 2015-07-13 23:34:45 +00:00
Sanket Padawe
2db9291ea4 am 7995ca41: Use same technology type for LTE/4G 
* commit '7995ca4165cae43b9bff25a6e6eafdb51445b698':
  Use same technology type for LTE/4G
 2015-07-13 23:01:45 +00:00
Chris Wren
b6d8b5f6a4 am 2f8bb8ea: Merge "import new view enums into MetricsLogger" into mnc-dev 
* commit '2f8bb8ea97e87cacbe307c1d78fa7a6e096530eb':
  import new view enums into MetricsLogger
 2015-07-13 23:01:29 +00:00
Zoltan Szatmary-Ban
c968c407f8 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 23:01:11 +00:00
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
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
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
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
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
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
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
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
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
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
Jason Monk
9362385095 am c07450ae: am 7ab3cf94: Merge "Fix wifi not re-ordering" into mnc-dev 
* commit 'c07450ae7449dd995499dd7cfd5c9367914d6b95':
  Fix wifi not re-ordering
 2015-07-10 19:04:47 +00:00
Rubin Xu
20eb7e10f2 am 331b9823: Merge "Remove unused MediaFormat activity" into mnc-dev 
* commit '331b9823d0a686d414f181ed406181d1d4e2aa1a':
  Remove unused MediaFormat activity
 2015-07-10 19:03:18 +00:00
Jason Monk
4484cc4ff4 am 7ab3cf94: Merge "Fix wifi not re-ordering" into mnc-dev 
* commit '7ab3cf944dd8c120555dada4fc490a9fe592f37e':
  Fix wifi not re-ordering
 2015-07-10 18:48:51 +00:00
Rubin Xu
331b9823d0 Merge "Remove unused MediaFormat activity" into mnc-dev 2015-07-10 18:47:51 +00:00
Jason Monk
7ab3cf944d Merge "Fix wifi not re-ordering" into mnc-dev 2015-07-10 18:37:19 +00:00
Jason Monk
088537a315 Fix wifi not re-ordering 
Bug: 22361247
Change-Id: I5c25061735628682741060c8a699c0a977c4351b
 2015-07-10 14:08:31 -04:00
Julia Reynolds
9da0c2a618 am f9a7abbe: am 1d595713: am 5a8b507e: am a368f9a9: am ddd887af: Prevent crash when removing an account. 
* commit 'f9a7abbea67bb7e00f84bda2d7a2f1543e9aac2d':
  Prevent crash when removing an account.
 2015-07-10 17:42:26 +00:00
Julia Reynolds
bc79da2b3e am ddd887af: Prevent crash when removing an account. 
* commit 'ddd887afc826b82b37ca8bd43c847479c94c07aa':
  Prevent crash when removing an account.
 2015-07-10 17:34:11 +00:00
Julia Reynolds
f9a7abbea6 am 1d595713: am 5a8b507e: am a368f9a9: am ddd887af: Prevent crash when removing an account. 
* commit '1d5957134ddf1add6ffd4f3fc947440402290fca':
  Prevent crash when removing an account.
 2015-07-10 17:28:08 +00:00
Julia Reynolds
5a8b507e34 am a368f9a9: am ddd887af: Prevent crash when removing an account. 
* commit 'a368f9a97405b6358515186614cd9f450119f937':
  Prevent crash when removing an account.
 2015-07-10 17:06:34 +00:00
Julia Reynolds
ddd887afc8 Prevent crash when removing an account. 
Bug: 21164141
Change-Id: Ib7cee6d8478b49339fd3477e2369da15069f9c3f
 2015-07-10 10:07:21 -04:00
Martijn Coenen
91dcad4089 Fix up Tap and Pay how it works. 
Also, don't use HCE service description.

Bug: 21988684
Bug: 21657963
Change-Id: I2facb30b80da5452ef14592c937e2db850c33835
 2015-07-10 15:43:25 +02:00
Xiaohui Chen
64f530c2f1 sys user split: refactor user settings 
BUG:19913735
Change-Id: I11e0c728d45bd74b60db89f352b356e97b755651
 2015-07-09 15:31:39 -07:00
Rubin Xu
af43d4ddb4 Remove unused MediaFormat activity 
As part of cleanup of ExternalStorageFormatter.
Bug: 9433509

Change-Id: I4d2bca544e00a549d8c136713da59d07648b9ffe
 2015-07-09 21:29:11 +01:00