Commit Graph

21392 Commits

Author SHA1 Message Date
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
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
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
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
1d5957134d am 5a8b507e: am a368f9a9: am ddd887af: Prevent crash when removing an account.
* commit '5a8b507e346b12cb76d3b2f0069da1310f409846':
  Prevent crash when removing an account.
2015-07-10 17:14:42 +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
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
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
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
e10b32ba41 am 1bde3259: am df778e8e: am 963e3fdd: Merge "Talkback improvements for Settings screens." into mnc-dev
* commit '1bde32596441375f41b9653eb22b22b3df915ebe':
  Talkback improvements for Settings screens.
2015-07-09 19:40:31 +00:00
Jason Monk
92b4f9a3d4 am 0f24766c: am cfd4b754: am 5c3b7c3a: Merge "Don\'t clear data summary when loader is cancelled" into mnc-dev
* commit '0f24766c9a23c4e3011206ae7e946faa1224e655':
  Don't clear data summary when loader is cancelled
2015-07-09 19:40:29 +00:00
Jason Monk
eb96e6ab43 am f2a3b6a0: am e60ad922: am b6b85325: Merge "Fix rotation issues" into mnc-dev
* commit 'f2a3b6a05d97264ac607a7cc898a4797c7fea031':
  Fix rotation issues
2015-07-09 19:40:28 +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
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
97c582300c am 64f55c4f: am 381adf9e: am ee77eced: Merge "Check signature match between Cert installer and Settings" into mnc-dev
* commit '64f55c4ffb8006bf982a9ca2617cfca1a140e9d9':
  Check signature match between Cert installer and Settings
2015-07-09 18:50:22 +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
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
Zoltan Szatmary-Ban
4dc5b67c12 am b8254212: am 325ba385: am 4bbe3d1f: Update all shown preferences in Settings > Storage
* commit 'b82542122e9b7b6e91fdc04956b81853db845255':
  Update all shown preferences in Settings > Storage
2015-07-09 15:40:29 +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
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
4a2e8fed1a am 2e97520e: am 49abf5f4: am 93b1a5a9: Merge "Fingerprint: Add post enroll call" into mnc-dev
* commit '2e97520ec03542071827eaea084055e9e16442fc':
  Fingerprint: Add post enroll call
2015-07-09 00:28:42 +00:00
Tim Kilbourn
5cf37f71eb am 8170e7a4: am 5ffa7c26: am 49983b99: Show correct text for app link domains.
* commit '8170e7a49bea3a1d9e92caefcd28ba4e32d8c072':
  Show correct text for app link domains.
2015-07-09 00:28:40 +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
Selim Cinek
31e554acff am babeeacb: am aab3a4c8: Merge "Fixed the layout for the fingerprint renaming" into mnc-dr-dev
* commit 'babeeacb58d0e24b752598de0383e082e6c76784':
  Fixed the layout for the fingerprint renaming
2015-07-08 23:37:50 +00: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
babeeacb58 am aab3a4c8: Merge "Fixed the layout for the fingerprint renaming" into mnc-dr-dev
* commit 'aab3a4c84715ecb4c95b60081badd225202723df':
  Fixed the layout for the fingerprint renaming
2015-07-08 23:22:58 +00:00