Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
21,499 Commits 1 Branch 0 Tags
49e0b9fdff9741f51e69683b2f79b6079d344a67
Commit Graph

8915 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
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
Zoltan Szatmary-Ban
e14e92a2ce am 4dc5b67c: am b8254212: am 325ba385: am 4bbe3d1f: Update all shown preferences in Settings > Storage 
* commit '4dc5b67c1280c7e8d83b99ba5671b58ae95a77ec':
  Update all shown preferences in Settings > Storage
 2015-07-09 15:53:00 +00:00
Zoltan Szatmary-Ban
b82542122e am 325ba385: am 4bbe3d1f: Update all shown preferences in Settings > Storage 
* commit '325ba38595f079a09a5c5fe4a18e35ad6dd24ee5':
  Update all shown preferences in Settings > Storage
 2015-07-09 15:27:39 +00: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
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
abe9b6c58f am 4a2e8fed: am 2e97520e: am 49abf5f4: am 93b1a5a9: Merge "Fingerprint: Add post enroll call" into mnc-dev 
* commit '4a2e8fed1a4f86139e3c40dfff9c7e75a8d96f40':
  Fingerprint: Add post enroll call
 2015-07-09 00:40:59 +00:00
Tim Kilbourn
c37d0fa9ea am 5cf37f71: am 8170e7a4: am 5ffa7c26: am 49983b99: Show correct text for app link domains. 
* commit '5cf37f71eba23cd596c989ab06e32c4c33bc3a40':
  Show correct text for app link domains.
 2015-07-09 00:40:58 +00:00
Sasha Levitskiy
2e97520ec0 am 49abf5f4: am 93b1a5a9: Merge "Fingerprint: Add post enroll call" into mnc-dev 
* commit '49abf5f4cb9d363246659f9320a3bfb99288adfa':
  Fingerprint: Add post enroll call
 2015-07-08 23:46:02 +00:00
Tim Kilbourn
8170e7a49b am 5ffa7c26: am 49983b99: Show correct text for app link domains. 
* commit '5ffa7c260f34ead64572b05b501bde0d194fef81':
  Show correct text for app link domains.
 2015-07-08 23:46:00 +00:00
Sasha Levitskiy
93b1a5a974 Merge "Fingerprint: Add post enroll call" into mnc-dev 2015-07-08 23:34:26 +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
Jorim Jaggi
2a90904f34 am 2986b0dc: am 221f3771: am 3b517b68: am b493b291: Merge "Hide screenshot preference when assist is disabled" into mnc-dev 
* commit '2986b0dc977131e80798b3701ba2c832537522d6':
  Hide screenshot preference when assist is disabled
 2015-07-08 22:52:08 +00:00
Jeff Sharkey
2f87423cb3 am 05d51e24: am 22f66408: am 68fdb73d: am 80eba76b: Merge "Move storage when formatting primary disk." into mnc-dev 
* commit '05d51e24744cb99edf00ea52b840be4d9662b8c2':
  Move storage when formatting primary disk.
 2015-07-08 22:52:06 +00: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
221f3771aa am 3b517b68: am b493b291: Merge "Hide screenshot preference when assist is disabled" into mnc-dev 
* commit '3b517b68057857a2b2552dd09e520907c809f15a':
  Hide screenshot preference when assist is disabled
 2015-07-08 22:22:13 +00:00
Jeff Sharkey
22f664084d am 68fdb73d: am 80eba76b: Merge "Move storage when formatting primary disk." into mnc-dev 
* commit '68fdb73d0cb2e354063ff5e37349d942923e379e':
  Move storage when formatting primary disk.
 2015-07-08 22:22:11 +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
Sanket Padawe
0af7dec8b5 am bd19918f: am 3dfe8963: am f7a64d20: am c9cdf9c8: Merge "Disable CA certificate for EAP-SIM, AKA & AKA\'" into mnc-dev 
* commit 'bd19918f87903031b6c32057a347d3759d9f1aca':
  Disable CA certificate for EAP-SIM, AKA & AKA'
 2015-07-08 21:21:55 +00:00