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

10364 Commits

Author SHA1 Message Date
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
Julia Reynolds
8abecf1bb9 am e124fabb: am e10b32ba: am 1bde3259: am df778e8e: am 963e3fdd: Merge "Talkback improvements for Settings screens." into mnc-dev 
* commit 'e124fabbf3a17791d59e76723d7a466a1a7bd756':
  Talkback improvements for Settings screens.
 2015-07-09 20:10:05 +00:00
Jason Monk
23af96e043 am af55d6f6: am 92b4f9a3: am 0f24766c: am cfd4b754: am 5c3b7c3a: Merge "Don\'t clear data summary when loader is cancelled" into mnc-dev 
* commit 'af55d6f6b3a7481a1942b4d1397f4cccf96849bf':
  Don't clear data summary when loader is cancelled
 2015-07-09 20:10:04 +00:00
Jason Monk
b27e1f4845 am 4faa6321: am eb96e6ab: am f2a3b6a0: am e60ad922: am b6b85325: Merge "Fix rotation issues" into mnc-dev 
* commit '4faa6321f63661e0aab81f6536fe63c0c12ca5d5':
  Fix rotation issues
 2015-07-09 20:10:02 +00:00
Julia Reynolds
e124fabbf3 am e10b32ba: am 1bde3259: am df778e8e: am 963e3fdd: Merge "Talkback improvements for Settings screens." into mnc-dev 
* commit 'e10b32ba414419c80d86d4105ddbfc14006290a9':
  Talkback improvements for Settings screens.
 2015-07-09 19:53:46 +00:00
Jason Monk
af55d6f6b3 am 92b4f9a3: am 0f24766c: am cfd4b754: am 5c3b7c3a: Merge "Don\'t clear data summary when loader is cancelled" into mnc-dev 
* commit '92b4f9a3d4d60c2085a7dcbef8c73051efa5ca78':
  Don't clear data summary when loader is cancelled
 2015-07-09 19:53:44 +00:00
Jason Monk
4faa6321f6 am eb96e6ab: am f2a3b6a0: am e60ad922: am b6b85325: Merge "Fix rotation issues" into mnc-dev 
* commit 'eb96e6ab434c7f94d47404c9f0521d86e40c25e3':
  Fix rotation issues
 2015-07-09 19:53:43 +00:00
Julia Reynolds
1bde325964 am df778e8e: am 963e3fdd: Merge "Talkback improvements for Settings screens." into mnc-dev 
* commit 'df778e8e76ca41c517385b8c30a468eecc37d107':
  Talkback improvements for Settings screens.
 2015-07-09 19:25:24 +00:00
Jason Monk
0f24766c9a am cfd4b754: am 5c3b7c3a: Merge "Don\'t clear data summary when loader is cancelled" into mnc-dev 
* commit 'cfd4b754886534418d378d4065200c14844f2b09':
  Don't clear data summary when loader is cancelled
 2015-07-09 19:25:22 +00:00
Jason Monk
f2a3b6a05d am e60ad922: am b6b85325: Merge "Fix rotation issues" into mnc-dev 
* commit 'e60ad922de334286cfd36c7f3939d34096e69049':
  Fix rotation issues
 2015-07-09 19:25:19 +00:00
Zoltan Szatmary-Ban
d8dabc9579 am 26aef1d4: am 97c58230: am 64f55c4f: am 381adf9e: am ee77eced: Merge "Check signature match between Cert installer and Settings" into mnc-dev 
* commit '26aef1d4768e476b20f79bddad6f67ca91cad584':
  Check signature match between Cert installer and Settings
 2015-07-09 19:18:23 +00:00
Zoltan Szatmary-Ban
26aef1d476 am 97c58230: am 64f55c4f: am 381adf9e: am ee77eced: Merge "Check signature match between Cert installer and Settings" into mnc-dev 
* commit '97c582300cffb2d8271b09ebc310ffc8741c4267':
  Check signature match between Cert installer and Settings
 2015-07-09 19:08:52 +00:00
Julia Reynolds
46ea05da72 am 963e3fdd: Merge "Talkback improvements for Settings screens." into mnc-dev 
* commit '963e3fdd05156bb11e6692222b2d08b34c7d126b':
  Talkback improvements for Settings screens.
 2015-07-09 19:08:36 +00:00
Jason Monk
dee0d05b5c am 5c3b7c3a: Merge "Don\'t clear data summary when loader is cancelled" into mnc-dev 
* commit '5c3b7c3adefe27bf0a91eba8318048b677d276eb':
  Don't clear data summary when loader is cancelled
 2015-07-09 19:08:33 +00:00
Jason Monk
296aec4127 am b6b85325: Merge "Fix rotation issues" into mnc-dev 
* commit 'b6b85325e91a3e22dd23d67241adecc359dc0952':
  Fix rotation issues
 2015-07-09 19:08:31 +00:00
Julia Reynolds
963e3fdd05 Merge "Talkback improvements for Settings screens." into mnc-dev 2015-07-09 18:57:24 +00:00
Jason Monk
5c3b7c3ade Merge "Don't clear data summary when loader is cancelled" into mnc-dev 2015-07-09 18:55:09 +00:00
Jason Monk
b6b85325e9 Merge "Fix rotation issues" into mnc-dev 2015-07-09 18:55:03 +00:00
Zoltan Szatmary-Ban
64f55c4ffb am 381adf9e: am ee77eced: Merge "Check signature match between Cert installer and Settings" into mnc-dev 
* commit '381adf9ea9b10e96cd0a13bee98fc26ba4566a4d':
  Check signature match between Cert installer and Settings
 2015-07-09 18:00:03 +00:00
Zoltan Szatmary-Ban
b0afdf2f5a am ee77eced: Merge "Check signature match between Cert installer and Settings" into mnc-dev 
* commit 'ee77eced69fac3e6f94cbb3ce2013d8334c17c90':
  Check signature match between Cert installer and Settings
 2015-07-09 17:48:59 +00:00
Zoltan Szatmary-Ban
ee77eced69 Merge "Check signature match between Cert installer and Settings" into mnc-dev 2015-07-09 17:33:23 +00:00
Julia Reynolds
ce25af4838 Talkback improvements for Settings screens. 
Bug: 21164141
Change-Id: I7444261ccf967f6db70c9fe44a00bd3f19ceb975
 2015-07-09 13:21:20 -04:00