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
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
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
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
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
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
3dfe8963e6
am f7a64d20
: am c9cdf9c8
: Merge "Disable CA certificate for EAP-SIM, AKA & AKA\'" into mnc-dev
...
* commit 'f7a64d206869ef783820f08966ad3bbf8ebe4559':
Disable CA certificate for EAP-SIM, AKA & AKA'
2015-07-08 20:53:31 +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
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
d81d249af4
am e46e4827
: am 64e1e15d
: Merge "Restore Vpn advanced options on re-init or rotate" into mnc-dev
...
* commit 'e46e48271aacbe3278acb0dc52b439da1c3ec8e9':
Restore Vpn advanced options on re-init or rotate
2015-07-08 16:40:44 +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
Jason Monk
e14fc96a9c
am fa10637f
: am 4652115f
: Merge "Handle uninstall from notifications list" into mnc-dev
...
* commit 'fa10637f2b42ba0d4cc81e6bb0f0a13eaf335e79':
Handle uninstall from notifications list
2015-07-08 13:57:40 +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
2cd50c45da
am 03b73068
: am 296e0aff
: Merge "Filter USB options on chooser when DISALLOW_USB_FILE_TRANSFER is on" into mnc-dev
...
* commit '03b73068128807b4308185d04ab4688e71e02000':
Filter USB options on chooser when DISALLOW_USB_FILE_TRANSFER is on
2015-07-08 12:12:30 +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
38a510df76
am 215af288
: am 461a48ba
: Merge "Making Settings > Storage multiprofile aware" into mnc-dev
...
* commit '215af288957eb64235af7a67af2143d1caf37428':
Making Settings > Storage multiprofile aware
2015-07-08 11:25:44 +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
Wei Liu
e0021c426c
Move NetworkPolicyEditor from Settings packge to settingslib.
...
Change-Id: I3a2f69c73d983643e65a0d4266cb98a203d5a813
2015-07-07 17:12:30 -07: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
Amith Yamasani
7ac21204e1
Merge "Use localized name for guest user" into mnc-dev
2015-07-07 20:20:03 +00:00
Robin Lee
290784afde
Match getLegacyVpn calls to changed interface
...
The userId argument is now explicit. Pre-requisite for bug 21499103
Change-Id: Ib83e9615326ea484ef6d63fb1a1d9c1659999dab
2015-07-07 12:35:14 -07:00
Zoltan Szatmary-Ban
6a00f6cf0b
Making Settings > Storage multiprofile aware
...
Also fixing the order of preferences there.
Bug: 22223456
Bug: 22117317
Change-Id: I9261fe46bfce518fd1ce3d0faef07cffe6869e34
2015-07-07 20:33:30 +01:00
Jason Monk
38f1889fea
Handle uninstall from notifications list
...
Don't crash in InstalledAppDetails on invalid app and finish app
notification details when the app goes away.
Bug: 22311566
Change-Id: I0bb7302dc16dd1a6f3aca152037705ad657d5554
2015-07-07 14:57:47 -04:00
Amith Yamasani
5d69aaea2a
Use localized name for guest user
...
Rather than use the stored name, which depends on the language
in use when the Guest was created, always try to use the localized
word for Guest.
Bug: 22205776
Change-Id: I1a4912b9561196eee811eae31c8df2b72413648f
2015-07-07 10:13:12 -07:00
Zoltan Szatmary-Ban
ec323a0849
Filter USB options on chooser when DISALLOW_USB_FILE_TRANSFER is on
...
Bug: 22291579
Change-Id: I32611404ef5f58c7484fe5c4b7a4f7782cc8daa3
2015-07-07 13:24:07 +01:00
Sanket Padawe
8c5d5c8c56
Disable CA certificate for EAP-SIM, AKA & AKA'
...
Bug: 21877800
Change-Id: I66dbb12ebcf94c094d2a71d91d8b2eeef8cf6f48
2015-07-06 16:14:43 -07:00
Robin Lee
6f4951a1fa
Restore Vpn advanced options on re-init or rotate
...
Visibility isn't restored as part of instance state by default.
Bug: 22183281
Change-Id: I86a7165e918251bc32f6884b9ad5f9c5987ca075
2015-07-06 11:40:27 -07:00
Jeff Sharkey
215fa65c10
Fix init order so we have something to measure.
...
Otherwise we start measuring without shared storage in place, meaning
we always find sizes of 0.
Bug: 22231501
Change-Id: I760064684e76e5ef5cce351aee1d81a971f4d4ea
2015-07-06 10:17:44 -07:00