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
46ea05da72
am 963e3fdd: Merge "Talkback improvements for Settings screens." into mnc-dev
...
* commit '963e3fdd05156bb11e6692222b2d08b34c7d126b':
Talkback improvements for Settings screens.
2015-07-09 19:08:36 +00:00
Jason Monk
dee0d05b5c
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:08:33 +00:00
Jason Monk
296aec4127
am b6b85325: Merge "Fix rotation issues" into mnc-dev
...
* commit 'b6b85325e91a3e22dd23d67241adecc359dc0952':
Fix rotation issues
2015-07-09 19:08:31 +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
b0afdf2f5a
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:48:59 +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
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
b0a8c4203c
am 4bbe3d1f: Update all shown preferences in Settings > Storage
...
* commit '4bbe3d1fb66a99bfdf4cad8f2e77df23dccebbbd':
Update all shown preferences in Settings > Storage
2015-07-09 15:14:59 +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
a5251bbcff
am 93b1a5a9: Merge "Fingerprint: Add post enroll call" into mnc-dev
...
* commit '93b1a5a974f723f5aa463162b1f5aa43338f8c2e':
Fingerprint: Add post enroll call
2015-07-08 23:38:42 +00:00
Tim Kilbourn
ad1aa5252f
am 49983b99: Show correct text for app link domains.
...
* commit '49983b991c01af0bc958eee1ddad144b7bde44ec':
Show correct text for app link domains.
2015-07-08 23:38:40 +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
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
221e0f4400
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:06 +00:00
Jeff Sharkey
6b09d2c982
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:05 +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
5fc2772b5d
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:01 +00:00
Sanket Padawe
2d633c9744
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:00 +00:00
Sanket Padawe
88701273e3
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:36:58 +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
Sanket Padawe
c7777b9470
Merge "Locale based string changes in BT." into mnc-dev
2015-07-08 17:15:57 +00:00
Sanket Padawe
c9cdf9c814
Merge "Disable CA certificate for EAP-SIM, AKA & AKA'" into mnc-dev
2015-07-08 17:14:55 +00:00
Robin Lee
d1e93240aa
am 64e1e15d: Merge "Restore Vpn advanced options on re-init or rotate" into mnc-dev
...
* commit '64e1e15d10b41f6993abf4cb77d220a05f79191a':
Restore Vpn advanced options on re-init or rotate
2015-07-08 16:27:30 +00:00
Robin Lee
64e1e15d10
Merge "Restore Vpn advanced options on re-init or rotate" into mnc-dev
2015-07-08 16:17:23 +00:00
Geoff Mendal
74d8ac2e27
am 4a332ee8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
...
* commit '4a332ee8ed15c991e29e46490d2a9d93117bca26':
Import translations. DO NOT MERGE
2015-07-08 15:50:30 +00:00
Geoff Mendal
4a332ee8ed
Merge "Import translations. DO NOT MERGE" into mnc-dev
2015-07-08 15:39:32 +00:00
Geoff Mendal
5a416db19e
Import translations. DO NOT MERGE
...
Change-Id: I442dee3b1b41104a76dc1293208010feb77dba7e
Auto-generated-cl: translation import
2015-07-08 08:19:19 -07:00
Jason Monk
49c7861984
am 4652115f: Merge "Handle uninstall from notifications list" into mnc-dev
...
* commit '4652115f1f75633b0cf3811910b0a5336fd90bf4':
Handle uninstall from notifications list
2015-07-08 13:43:21 +00:00
Jason Monk
4652115f1f
Merge "Handle uninstall from notifications list" into mnc-dev
2015-07-08 13:34:41 +00:00
Zoltan Szatmary-Ban
909ddcca43
am 296e0aff: Merge "Filter USB options on chooser when DISALLOW_USB_FILE_TRANSFER is on" into mnc-dev
...
* commit '296e0aff022196ef2fec934878d8721828bea3f1':
Filter USB options on chooser when DISALLOW_USB_FILE_TRANSFER is on
2015-07-08 11:58:50 +00:00
Zoltan Szatmary-Ban
296e0aff02
Merge "Filter USB options on chooser when DISALLOW_USB_FILE_TRANSFER is on" into mnc-dev
2015-07-08 11:45:04 +00:00
Zoltan Szatmary-Ban
e78d9ab78f
am 461a48ba: Merge "Making Settings > Storage multiprofile aware" into mnc-dev
...
* commit '461a48bac97c24706fd3b2f789648f61a42def42':
Making Settings > Storage multiprofile aware
2015-07-08 11:10:28 +00:00
Zoltan Szatmary-Ban
461a48bac9
Merge "Making Settings > Storage multiprofile aware" into mnc-dev
2015-07-08 10:54:19 +00:00
Jeff Sharkey
697ff544bf
Move storage when formatting primary disk.
...
On devices where the primary storage is configured as a physical
device, and when we adopt that device, automatically move the
primary storage to be hosted on the newly created emulated volume.
Bug: 20275423
Change-Id: I759e65a01b323ef3c9ffb86d0b7c8e7b4768a45c
2015-07-07 22:14:18 -07:00
Christopher Tate
2db668d547
am 8023385e: Merge "App link handling is not just for "official" verified handlers" into mnc-dev
...
* commit '8023385e56e472a55e9c6f5034e04a10f1088f57':
App link handling is not just for "official" verified handlers
2015-07-07 23:49:48 +00:00
Christopher Tate
8023385e56
Merge "App link handling is not just for "official" verified handlers" into mnc-dev
2015-07-07 23:36:15 +00:00
Christopher Tate
a08a225d18
App link handling is not just for "official" verified handlers
...
Allow apps to be enabled as link handlers for their accepted domains
even when they are not the "official" apps for those domains.
Also clean up a bunch of inconsistent/wrong state reporting in the UI.
Bug 22069429
Change-Id: Ic3b2bcc476dfc30085d3df7412b02bdc5d53df6d
2015-07-07 14:09:52 -07:00