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
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
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
2986b0dc97
am 221f3771: am 3b517b68: am b493b291: Merge "Hide screenshot preference when assist is disabled" into mnc-dev
...
* commit '221f3771aa3830ca8b8b662994759431dae2ee5b':
Hide screenshot preference when assist is disabled
2015-07-08 22:37:47 +00:00
Jeff Sharkey
05d51e2474
am 22f66408: am 68fdb73d: am 80eba76b: Merge "Move storage when formatting primary disk." into mnc-dev
...
* commit '22f664084dc0885a495194a907ce4c2af36c9c54':
Move storage when formatting primary disk.
2015-07-08 22:37:44 +00: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
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
2d2fa18279
am f3053c15: am e08a3512: am 07578125: am 2856c4fc: am 01ce80b5: Merge "Remove \'do not translate\' comment for string \'None\'." into mnc-dev
...
* commit 'f3053c15e3cb09af1e6939d2632a3476506be74a':
Remove 'do not translate' comment for string 'None'.
2015-07-08 21:37:53 +00:00
Sanket Padawe
5418ef080b
am d49fbb37: am 012876e4: am beb277de: am a63ee14f: am c7777b94: Merge "Locale based string changes in BT." into mnc-dev
...
* commit 'd49fbb372a504b1644b8880da59108a3816f6f36':
Locale based string changes in BT.
2015-07-08 21:37:52 +00:00
Sanket Padawe
0c9d1b7ba3
am 0af7dec8: am bd19918f: am 3dfe8963: am f7a64d20: am c9cdf9c8: Merge "Disable CA certificate for EAP-SIM, AKA & AKA\'" into mnc-dev
...
* commit '0af7dec8b5c9916c5c05c565d365f6871f35bbf6':
Disable CA certificate for EAP-SIM, AKA & AKA'
2015-07-08 21:37:51 +00:00
Robin Lee
d3e81eb74a
am 243a53cd: am a0c850f2: am d81d249a: am e46e4827: am 64e1e15d: Merge "Restore Vpn advanced options on re-init or rotate" into mnc-dev
...
* commit '243a53cd6e3af7e52d5e00bbb1841bedf038f477':
Restore Vpn advanced options on re-init or rotate
2015-07-08 21:37:50 +00:00
Amit Mahajan
f3053c15e3
am e08a3512: am 07578125: am 2856c4fc: am 01ce80b5: Merge "Remove \'do not translate\' comment for string \'None\'." into mnc-dev
...
* commit 'e08a3512bbfb9c3ab73790cf382b514ec4924397':
Remove 'do not translate' comment for string 'None'.
2015-07-08 21:21:57 +00:00
Sanket Padawe
d49fbb372a
am 012876e4: am beb277de: am a63ee14f: am c7777b94: Merge "Locale based string changes in BT." into mnc-dev
...
* commit '012876e400d573c9f2deb3c076c611f651e6e2ec':
Locale based string changes in BT.
2015-07-08 21:21:56 +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
Amit Mahajan
e08a3512bb
am 07578125: am 2856c4fc: am 01ce80b5: Merge "Remove \'do not translate\' comment for string \'None\'." into mnc-dev
...
* commit '0757812525349f31d921bc877886ece7d3a44c4d':
Remove 'do not translate' comment for string 'None'.
2015-07-08 21:08:11 +00:00
Sanket Padawe
012876e400
am beb277de: am a63ee14f: am c7777b94: Merge "Locale based string changes in BT." into mnc-dev
...
* commit 'beb277de3c01ca1bfed1e22be682a3f79325a6bf':
Locale based string changes in BT.
2015-07-08 21:08:09 +00:00
Sanket Padawe
bd19918f87
am 3dfe8963: am f7a64d20: am c9cdf9c8: Merge "Disable CA certificate for EAP-SIM, AKA & AKA\'" into mnc-dev
...
* commit '3dfe8963e6d2a02818a22f6a063fb671e7560d10':
Disable CA certificate for EAP-SIM, AKA & AKA'
2015-07-08 21:08:08 +00:00
