PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,613 Commits 1 Branch 0 Tags
c968c407f809f06dda02dffe25ea2a4ee9f4cb15
Commit Graph

20613 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Geoff Mendal
92a33ff73e am da15ade8: (-s ours) Import translations. DO NOT MERGE 
* commit 'da15ade8300bb875b8d874e1f68032f6ffe95719':
  Import translations. DO NOT MERGE
 2015-07-13 23:00:39 +00:00
Maurice Lam
c6178ba012 Merge "[Fingerprint] Export FingerprintEnrollIntroduction" into mnc-dr-dev 2015-07-13 20:20:57 +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
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
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
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
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
Robin Lee
7ba46433ae Merge "Match getLegacyVpn calls to changed interface" into mnc-dev 2015-07-10 19:05:41 +00:00
Rubin Xu
8b9a9519c8 am 331b9823: Merge "Remove unused MediaFormat activity" into mnc-dev 
* commit '331b9823d0a686d414f181ed406181d1d4e2aa1a':
  Remove unused MediaFormat activity
 2015-07-10 19:03:19 +00:00
Jason Monk
c07450ae74 am 7ab3cf94: Merge "Fix wifi not re-ordering" into mnc-dev 
* commit '7ab3cf944dd8c120555dada4fc490a9fe592f37e':
  Fix wifi not re-ordering
 2015-07-10 18:48:32 +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
a368f9a974 am ddd887af: Prevent crash when removing an account. 
* commit 'ddd887afc826b82b37ca8bd43c847479c94c07aa':
  Prevent crash when removing an account.
 2015-07-10 16:51:37 +00:00
Julia Reynolds
ddd887afc8 Prevent crash when removing an account. 
Bug: 21164141
Change-Id: Ib7cee6d8478b49339fd3477e2369da15069f9c3f
 2015-07-10 10:07:21 -04: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
df778e8e76 am 963e3fdd: Merge "Talkback improvements for Settings screens." into mnc-dev 
* commit '963e3fdd05156bb11e6692222b2d08b34c7d126b':
  Talkback improvements for Settings screens.
 2015-07-09 19:09:25 +00:00
Jason Monk
cfd4b75488 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:09:23 +00:00
Jason Monk
e60ad922de am b6b85325: Merge "Fix rotation issues" into mnc-dev 
* commit 'b6b85325e91a3e22dd23d67241adecc359dc0952':
  Fix rotation issues
 2015-07-09 19:09:21 +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
381adf9ea9 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:49:56 +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
Zoltan Szatmary-Ban
307e3d048d Check signature match between Cert installer and Settings 
To prevent an app masquerading as com.android.certinstaller install
malicious certs.

Bug: 22095968
Change-Id: Ia79f326af0f39a23b687cb08981920665669e0a1
 2015-07-09 18:16:27 +01:00
Jason Monk
e950b54fcd Don't clear data summary when loader is cancelled 
Keep whatever summary we had before.

Bug: 22351861
Change-Id: Id2088404f09dcadce1cbf2959918956844d613a7
 2015-07-09 11:22:26 -04:00
Zoltan Szatmary-Ban
325ba38595 am 4bbe3d1f: Update all shown preferences in Settings > Storage 
* commit '4bbe3d1fb66a99bfdf4cad8f2e77df23dccebbbd':
  Update all shown preferences in Settings > Storage
 2015-07-09 15:14:32 +00:00
Zoltan Szatmary-Ban
4bbe3d1fb6 Update all shown preferences in Settings > Storage 
This is achieved by iterating through the pool of StorageItemPreferences up
to the index of the last shown one, instead of iterating through the
preferences of the screen which may miss preferences inside other top-level
preference groups.

Bug: 22353561
Change-Id: I2293a7949a5becfb506d6b7965f8db2f11845756
 2015-07-09 15:37:26 +01:00
Jason Monk
b573a1659d Fix rotation issues 
Bug: 22373905
Bug: 22311581
Change-Id: Idbed99a3fc0cc64047da151be166ee0ea4c1fb3d
 2015-07-09 10:33:58 -04:00
Sasha Levitskiy
49abf5f4cb am 93b1a5a9: Merge "Fingerprint: Add post enroll call" into mnc-dev 
* commit '93b1a5a974f723f5aa463162b1f5aa43338f8c2e':
  Fingerprint: Add post enroll call
 2015-07-08 23:37:33 +00:00
Tim Kilbourn
5ffa7c260f am 49983b99: Show correct text for app link domains. 
* commit '49983b991c01af0bc958eee1ddad144b7bde44ec':
  Show correct text for app link domains.
 2015-07-08 23:37:32 +00:00
Sasha Levitskiy
93b1a5a974 Merge "Fingerprint: Add post enroll call" into mnc-dev 2015-07-08 23:34:26 +00:00
Selim Cinek
aab3a4c847 Merge "Fixed the layout for the fingerprint renaming" into mnc-dr-dev 2015-07-08 23:09:52 +00:00
Sasha Levitskiy
0e0cff3261 Fingerprint: Add post enroll call 
Bug 22007124

Change-Id: I670e101a1b7dfa77a4e45022840dfc916fe5ee0d
Signed-off-by: Sasha Levitskiy <sanek@google.com>
 2015-07-08 16:03:11 -07:00
Selim Cinek
abd67de1ad Fixed the layout for the fingerprint renaming 
Bug: 21957061
Change-Id: I3bf0ecb1f513b51e2632cb9ddbb29e51a39a915c
 2015-07-08 15:47:56 -07:00
Tim Kilbourn
49983b991c Show correct text for app link domains. 
The user's preferences were not queried on the app listing, making it
look like an app would open links even after the user disabled app
links for the app.

Bug: 21093152
Change-Id: I133ff229bb5e289ebec8df06924936fb3177f095
 2015-07-08 15:43:43 -07:00
Jorim Jaggi
3b517b6805 am b493b291: Merge "Hide screenshot preference when assist is disabled" into mnc-dev 
* commit 'b493b2910190b95bba6cad0f328a0339acebef9b':
  Hide screenshot preference when assist is disabled
 2015-07-08 22:08:34 +00:00
Jeff Sharkey
68fdb73d0c am 80eba76b: Merge "Move storage when formatting primary disk." into mnc-dev 
* commit '80eba76b109efa7e48eaf7aac145e05938d4405e':
  Move storage when formatting primary disk.
 2015-07-08 22:08:32 +00:00
Jorim Jaggi
b493b29101 Merge "Hide screenshot preference when assist is disabled" into mnc-dev 2015-07-08 21:59:01 +00:00
Jeff Sharkey
80eba76b10 Merge "Move storage when formatting primary disk." into mnc-dev 2015-07-08 21:55:44 +00:00
Amit Mahajan
2856c4fcbd am 01ce80b5: Merge "Remove \'do not translate\' comment for string \'None\'." into mnc-dev 
* commit '01ce80b574e2404d911750c16a1ddd89c787f3ff':
  Remove 'do not translate' comment for string 'None'.
 2015-07-08 20:37:19 +00:00
Sanket Padawe
a63ee14f45 am c7777b94: Merge "Locale based string changes in BT." into mnc-dev 
* commit 'c7777b947097160cd89252f1f1e27704d82c25f6':
  Locale based string changes in BT.
 2015-07-08 20:37:18 +00:00
Sanket Padawe
f7a64d2068 am c9cdf9c8: Merge "Disable CA certificate for EAP-SIM, AKA & AKA\'" into mnc-dev 
* commit 'c9cdf9c814020c777ffec7cfceb5b38c74e091f5':
  Disable CA certificate for EAP-SIM, AKA & AKA'
 2015-07-08 20:37:16 +00:00
Jorim Jaggi
56db978c2a Hide screenshot preference when assist is disabled 
Bug: 22343636
Change-Id: Ic455232dda209f7fadec41aee85903623a4e6bda
 2015-07-08 13:32:12 -07:00
Amit Mahajan
01ce80b574 Merge "Remove 'do not translate' comment for string 'None'." into mnc-dev 2015-07-08 20:24:10 +00:00
Amit Mahajan
3cd87a2f70 Remove 'do not translate' comment for string 'None'. 
Bug: 22278463
Change-Id: I29c288cd36cd7b65132b42a4b78749afa81064d6
 2015-07-08 11:07:34 -07:00