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
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
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
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
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
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
Narayan Kamath
e92cc80bbf
Lose some deprecated test annotations.
...
Will be deleted shortly. They're no-ops because nobody knows
how to process them.
Change-Id: I2898a57e508b0bc39edb2cc2ab7a26f98de608e0
2015-07-09 17:58:27 +01:00
Zoltan Szatmary-Ban
b211a5d2b9
am e14e92a2: am 4dc5b67c: am b8254212: am 325ba385: am 4bbe3d1f: Update all shown preferences in Settings > Storage
...
* commit 'e14e92a2ceac5827e35aa62ba6a82d3f87300d50':
Update all shown preferences in Settings > Storage
2015-07-09 16:07:29 +00: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
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
a8a87c0425
am abe9b6c5: am 4a2e8fed: am 2e97520e: am 49abf5f4: am 93b1a5a9: Merge "Fingerprint: Add post enroll call" into mnc-dev
...
* commit 'abe9b6c58fc482286ff6d1ffc1eb9ef807af261d':
Fingerprint: Add post enroll call
2015-07-09 00:54:10 +00:00
Tim Kilbourn
f8287521b3
am c37d0fa9: am 5cf37f71: am 8170e7a4: am 5ffa7c26: am 49983b99: Show correct text for app link domains.
...
* commit 'c37d0fa9ea0693bc70f2b2a40f88e5b6bb0586ea':
Show correct text for app link domains.
2015-07-09 00:54:09 +00: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
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
Selim Cinek
05df42cd98
am 8c3c8814: am 31e554ac: am babeeacb: am aab3a4c8: Merge "Fixed the layout for the fingerprint renaming" into mnc-dr-dev
...
* commit '8c3c8814f5e826c87f1db777c1bad71616a1c4a8':
Fixed the layout for the fingerprint renaming
2015-07-09 00:07:45 +00:00
Selim Cinek
8c3c8814f5
am 31e554ac: am babeeacb: am aab3a4c8: Merge "Fixed the layout for the fingerprint renaming" into mnc-dr-dev
...
* commit '31e554acff0106cade16516a056bdc1b0087ee6c':
Fixed the layout for the fingerprint renaming
2015-07-08 23:53:05 +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
Selim Cinek
aab3a4c847
Merge "Fixed the layout for the fingerprint renaming" into mnc-dr-dev
2015-07-08 23:09:52 +00:00
Jorim Jaggi
5028fb8ad5
am 2a90904f: am 2986b0dc: am 221f3771: am 3b517b68: am b493b291: Merge "Hide screenshot preference when assist is disabled" into mnc-dev
...
* commit '2a90904f34b44bee007a51a6640b0ef8958f1e9f':
Hide screenshot preference when assist is disabled
2015-07-08 23:06:37 +00:00
Jeff Sharkey
b7f6b87aa5
am 2f87423c: am 05d51e24: am 22f66408: am 68fdb73d: am 80eba76b: Merge "Move storage when formatting primary disk." into mnc-dev
...
* commit '2f87423cb3b3e8ccdd40a08d26d535c716061b9d':
Move storage when formatting primary disk.
2015-07-08 23:06:35 +00:00
