OSDN Git Service
Geoff Mendal [Mon, 20 Jul 2015 22:33:59 +0000 (15:33 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1a4e18120641388458b5f90a531978292f307bc6
Auto-generated-cl: translation import
Makoto Onuki [Mon, 20 Jul 2015 20:35:07 +0000 (20:35 +0000)]
Merge "Fix ugly text wrapping on non-english locales" into mnc-dev
Jason Monk [Mon, 20 Jul 2015 20:32:28 +0000 (20:32 +0000)]
Merge "Handle monkey crash" into mnc-dev
Jason Monk [Mon, 20 Jul 2015 17:40:40 +0000 (13:40 -0400)]
Handle monkey crash
Don't create dialog if we don't have one to create, and make sure
that storage-related prefs are removed when they aren't needed.
Bug:
22571238
Change-Id: I452cbf75313cd14572fc7b57bd6164292cf17209
Christopher Tate [Mon, 20 Jul 2015 17:06:26 +0000 (17:06 +0000)]
Merge "Offer 'ask' as an available app-linking state" into mnc-dev
Christopher Tate [Fri, 17 Jul 2015 20:15:12 +0000 (13:15 -0700)]
Offer 'ask' as an available app-linking state
Bug
22532193
Change-Id: I5bb43b1b8d84af1901f99fb10dd899c260d94c99
Jim Miller [Fri, 17 Jul 2015 21:05:06 +0000 (21:05 +0000)]
Merge "Simplify FingerprintSettings" into mnc-dev
Jim Miller [Fri, 17 Jul 2015 00:20:17 +0000 (17:20 -0700)]
Simplify FingerprintSettings
There's no need for FingerprintSettings to retry fingerprint
any more often than these cases: 1. authentication success,
2. authentication error and 3. when the activity resumes.
Fixes bug
22438498
Change-Id: I87841e9916cfc9e6c64cd1df009b9a9c765f87d0
Julia Reynolds [Fri, 17 Jul 2015 20:11:25 +0000 (20:11 +0000)]
Merge "Remove blank switchtext from switch preferences." into mnc-dev
Billy Lau [Fri, 17 Jul 2015 18:28:27 +0000 (18:28 +0000)]
Merge "Bug
21589105 Rescope SYSTEM_ALERT_WINDOW (UX and Settings app change)..." into mnc-dev
Billy Lau [Thu, 16 Jul 2015 02:50:47 +0000 (03:50 +0100)]
Bug
21589105 Rescope SYSTEM_ALERT_WINDOW (UX and Settings app change)...
Overall, fixed the detection of the state of permission in the corresponding UX
to be more accurate. Also ensured that apps can actually launch the summary UX
through a custom intent.
AndroidManifest:
Adds the proper intent-filter so that apps can launch the Settings page using
intent.
strings:
Made changes to strings so that wordings are uniform everywhere and raised the
char limit due to requests from translators.
Change-Id: Ia03403641ad53bd1a33b84dae6db1739cfcf9d60
Christopher Tate [Thu, 16 Jul 2015 23:00:49 +0000 (16:00 -0700)]
Intent filters need CATEGORY_BROWSABLE to be app-linking eligible
Bug
22504009
Change-Id: I19ded70cf17936504a2a1becea2684d87952dff6
Makoto Onuki [Thu, 16 Jul 2015 22:43:47 +0000 (15:43 -0700)]
Fix ugly text wrapping on non-english locales
Bug
22284618
Change-Id: Iaab017fa5d2f5aeb3457f911cbd31ceb8671e495
Julia Reynolds [Wed, 15 Jul 2015 15:08:11 +0000 (11:08 -0400)]
Remove blank switchtext from switch preferences.
This makes TTS services read the default text (on/off) when
these switches are toggled.
Bug:
22530662
Change-Id: I77c5918481faa6309995aa385dcfc3608fc94298
Kenny Guy [Thu, 16 Jul 2015 12:42:39 +0000 (12:42 +0000)]
Merge "Show disabled trust agents as off." into mnc-dev
Sanket Padawe [Thu, 16 Jul 2015 05:01:06 +0000 (05:01 +0000)]
Merge "Use common xml file for multi-tab settings." into mnc-dev
Maurice Lam [Thu, 16 Jul 2015 02:19:18 +0000 (02:19 +0000)]
Merge "[Fingerprint] Use accent color for fingerprint highlight" into mnc-dev
Jason Monk [Wed, 15 Jul 2015 22:48:12 +0000 (22:48 +0000)]
Merge "Disable ignore battery optimization items that can't change" into mnc-dev
Jason Monk [Wed, 15 Jul 2015 22:48:05 +0000 (22:48 +0000)]
Merge "Change move storage from dropdown pref to dialog" into mnc-dev
Jason Monk [Wed, 15 Jul 2015 17:04:59 +0000 (13:04 -0400)]
Change move storage from dropdown pref to dialog
Use a horizontal pref and a single button that triggers the dialog
Bug:
21922660
Change-Id: Ifb4de75ca9269d2e8163eec5602932260adec0d9
Maurice Lam [Wed, 15 Jul 2015 19:28:05 +0000 (19:28 +0000)]
Merge "[Fingerprint] Add fingerprint enroll in setup wizard" into mnc-dev
Jason Monk [Wed, 15 Jul 2015 19:22:38 +0000 (15:22 -0400)]
Disable ignore battery optimization items that can't change
Bug:
22507803
Change-Id: Ia33746dc569f4d9f96242a502e54bcc8eb47bf12
Jim Miller [Wed, 15 Jul 2015 19:18:05 +0000 (19:18 +0000)]
Merge "Fixed the layout for the fingerprint renaming" into mnc-dev
Maurice Lam [Wed, 15 Jul 2015 18:45:33 +0000 (18:45 +0000)]
Merge "[Fingerprint] Export FingerprintEnrollIntroduction" into mnc-dev
Maurice Lam [Thu, 9 Jul 2015 23:38:37 +0000 (16:38 -0700)]
[Fingerprint] Add fingerprint enroll in setup wizard
Make a subclass for each enrolling screen that setup wizard uses, and
in override the corresponding get*Intent methods to always use the
setup wizard versions of the next screens.
On minor change made to the original flow is that it will now return
RESULT_OK if it is finished, as opposed to RESULT_CANCELED.
Bug:
21695577
Change-Id: Id666826e8027272ede6a5426967d66fb291670a4
Maurice Lam [Wed, 8 Jul 2015 23:59:59 +0000 (16:59 -0700)]
[Fingerprint] Export FingerprintEnrollIntroduction
Export FingerprintEnrollIntroduction activity under the permission
MANAGE_FINGERPRINT so that setup wizard can start it.
Bug:
21695577
Change-Id: If466c6e484a4aa0c10382cfedab0aad10ae26702
(cherry picked from commit
052297172e33ec906a5da10a953be811ff60731c)
Selim Cinek [Wed, 8 Jul 2015 21:09:10 +0000 (14:09 -0700)]
Fixed the layout for the fingerprint renaming
Bug:
21957061
Change-Id: I3bf0ecb1f513b51e2632cb9ddbb29e51a39a915c
(cherry picked from commit
abd67de1ad3f265f217491b0e8b21819cfdcdcbe)
Kenny Guy [Wed, 15 Jul 2015 14:54:38 +0000 (15:54 +0100)]
Show disabled trust agents as off.
When trust agents are disabled by the admin
show the greyed out toggle as off.
Bug:
22397930
Change-Id: I687a5dee0ca9bed5015a4af080270f7bafa5a37d
Jason Monk [Wed, 15 Jul 2015 14:54:02 +0000 (14:54 +0000)]
Merge "Fix Help menu for PrivateVolumeSettings" into mnc-dev
Geoff Mendal [Wed, 15 Jul 2015 13:56:45 +0000 (06:56 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0bd7d5fb307ffa5fd3b001eaf5cf7697168e90d6
Auto-generated-cl: translation import
xinhe [Tue, 14 Jul 2015 22:29:17 +0000 (22:29 +0000)]
Merge "Need to disable 5GHz bands for WiFi tethering in Japan" into mnc-dev
xinhe [Mon, 13 Jul 2015 22:26:45 +0000 (15:26 -0700)]
Need to disable 5GHz bands for WiFi tethering in Japan
b/
22396383
Change-Id: I99090f28eff1b232ebba89ff638e37be82a3f21b
Jim Miller [Tue, 14 Jul 2015 21:02:00 +0000 (21:02 +0000)]
Merge "Postpone call to postEnroll() until we actually leave activity." into mnc-dev
Jason Monk [Tue, 14 Jul 2015 20:20:31 +0000 (20:20 +0000)]
Merge "Add content description to wifi networks" into mnc-dev
Jason Monk [Tue, 14 Jul 2015 19:00:22 +0000 (15:00 -0400)]
Fix Help menu for PrivateVolumeSettings
Call super.onCreateOptionsMenu so that the auto help stuff can
work properly.
Bug:
22202745
Change-Id: Iee6b4a81574c7e981290465a78641f3c5b06c143
Billy Lau [Tue, 14 Jul 2015 18:22:29 +0000 (18:22 +0000)]
Merge "Bug:
21589105 Rescoping SYSTEM_ALERT_WINDOW and WRITE_SETTINGS permission to an explicit toggle to be enabled through Settings via Apps -> Advanced Apps." into mnc-dev
Sanket Padawe [Tue, 14 Jul 2015 18:13:43 +0000 (11:13 -0700)]
Use common xml file for multi-tab settings.
Bug:
22360525
Change-Id: Id4d971e0afcd9ecd43005a0a5056ad03a32b704f
Jason Monk [Tue, 14 Jul 2015 18:00:07 +0000 (14:00 -0400)]
Add content description to wifi networks
Bug:
22468835
Change-Id: Ifd9d0384030befbd221b14599159348bf56d41c8
Jorim Jaggi [Tue, 14 Jul 2015 17:50:32 +0000 (17:50 +0000)]
Merge "Disable voice input if assist is voice service" into mnc-dev
Jason Monk [Tue, 14 Jul 2015 13:53:28 +0000 (13:53 +0000)]
Merge "Disable notification volume when user restricted" into mnc-dev
Martijn Coenen [Tue, 14 Jul 2015 07:44:58 +0000 (07:44 +0000)]
Merge "Fix up Tap and Pay how it works." into mnc-dev
Jorim Jaggi [Fri, 10 Jul 2015 23:48:37 +0000 (16:48 -0700)]
Disable voice input if assist is voice service
Bug:
22358252
Change-Id: Id4a9de8c5287c5e025d0ccc7f98edd8855db519c
Maurice Lam [Fri, 10 Jul 2015 00:16:35 +0000 (17:16 -0700)]
[Fingerprint] Use accent color for fingerprint highlight
Set the fingerprint activated color, while registering a new
fingerprint to be 50% alpha of the accent color. This allows the
color to be changed with the theme, so that it will be highlighted
blue during setup wizard.
Bug:
21695577
Change-Id: Iee68506a4fbb8e8996bdb52694992ac460ae943d
Jim Miller [Mon, 13 Jul 2015 22:58:59 +0000 (15:58 -0700)]
Postpone call to postEnroll() until we actually leave activity.
The existing code was calling postEnroll() too soon, which resulted
in the inability to add more than one fingerprint. The solution is to
only call postEnroll() when we're leaving the activity.
Fixes bug
22438498
Change-Id: Ia134899e12b4edc9cced834e99cb2bfd2d51321f
Billy Lau [Fri, 3 Jul 2015 16:01:18 +0000 (17:01 +0100)]
Bug:
21589105 Rescoping SYSTEM_ALERT_WINDOW and WRITE_SETTINGS permission to an
explicit toggle to be enabled through Settings via Apps -> Advanced Apps.
Added new and refactored an old xml to define the UX for two new Preferences
in Advanced Settings. Modified the existing AdvancedAppSettings to add
control flow for two new settings. Also enriched ManageApplications to
handle these cases. Added additional strings in xml/values/strings.xml
to support these settings. Also defined new classes to handle these the
toggle of these permissions per app.
Refactored codes from AppStateUsageBridge to a generic AppStateAppOpsBridge so
that future usages related to AppOps can inherit from this class.
Change-Id: I43b81282a063e05844c7805556a6d05cfc02bcdb
Jason Monk [Mon, 13 Jul 2015 19:15:36 +0000 (15:15 -0400)]
Disable notification volume when user restricted
Bug:
22327825
Change-Id: I892627e00d9ebe2cd67348ce6da3c9c7bc0251fc
Jason Monk [Mon, 13 Jul 2015 18:05:53 +0000 (18:05 +0000)]
Merge "Fix app icon size" into mnc-dev
Sanket Padawe [Mon, 13 Jul 2015 17:15:41 +0000 (10:15 -0700)]
Use same technology type for LTE/4G
Though status bar and preferred network type show 4G, still show
LTE in SIM status when device set config_show4GForLTE true
Bug:
22213113
Change-Id: I2866a868992af7b4eb661d693a0cce60bb1b3402
Chris Wren [Mon, 13 Jul 2015 16:21:21 +0000 (16:21 +0000)]
Merge "import new view enums into MetricsLogger" into mnc-dev
Jason Monk [Mon, 13 Jul 2015 16:18:43 +0000 (12:18 -0400)]
Fix app icon size
Bug:
22425103
Change-Id: I35b3476eb75d221e5f244702534d4475b2c5921e
Geoff Mendal [Mon, 13 Jul 2015 13:54:00 +0000 (13:54 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Mon, 13 Jul 2015 13:53:26 +0000 (06:53 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ice9d7f5cfe191a669657298432c0ecfae0f438bb
Auto-generated-cl: translation import
Zoltan Szatmary-Ban [Mon, 13 Jul 2015 13:09:53 +0000 (13:09 +0000)]
Merge "Do not throw exception when MeasurementDetails.mediaSize is empty" into mnc-dev
Zoltan Szatmary-Ban [Mon, 13 Jul 2015 11:37:31 +0000 (12:37 +0100)]
Do not throw exception when MeasurementDetails.mediaSize is empty
It is legitimate for StorageMeasurement.measureExactStorage to return without any user keys
added to the returned MeasurementDetails, when the following is true:
mVolume == null || !mVolume.isMountedReadable()
Bug:
22394495
Change-Id: Ie40bd468a487208d98dc56aae41fdad7098f41a5
Geoff Mendal [Sat, 11 Jul 2015 13:59:16 +0000 (06:59 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib1f4051b1001de52b74483fc18eaf909e656de67
Auto-generated-cl: translation import
Chris Wren [Fri, 10 Jul 2015 21:19:58 +0000 (17:19 -0400)]
import new view enums into MetricsLogger
Bug:
21114836
Change-Id: I9a6e00ab8d85726ca6505a28ca7a52aef5aa1e1a
Robin Lee [Fri, 10 Jul 2015 19:05:36 +0000 (19:05 +0000)]
Merge "Match getLegacyVpn calls to changed interface" into mnc-dev
Rubin Xu [Fri, 10 Jul 2015 18:47:49 +0000 (18:47 +0000)]
Merge "Remove unused MediaFormat activity" into mnc-dev
Jason Monk [Fri, 10 Jul 2015 18:37:19 +0000 (18:37 +0000)]
Merge "Fix wifi not re-ordering" into mnc-dev
Jason Monk [Fri, 10 Jul 2015 17:42:35 +0000 (13:42 -0400)]
Fix wifi not re-ordering
Bug:
22361247
Change-Id: I5c25061735628682741060c8a699c0a977c4351b
Julia Reynolds [Fri, 10 Jul 2015 14:07:21 +0000 (10:07 -0400)]
Prevent crash when removing an account.
Bug:
21164141
Change-Id: Ib7cee6d8478b49339fd3477e2369da15069f9c3f
Martijn Coenen [Tue, 7 Jul 2015 07:35:19 +0000 (09:35 +0200)]
Fix up Tap and Pay how it works.
Also, don't use HCE service description.
Bug:
21988684
Bug:
21657963
Change-Id: I2facb30b80da5452ef14592c937e2db850c33835
Rubin Xu [Thu, 9 Jul 2015 20:01:08 +0000 (21:01 +0100)]
Remove unused MediaFormat activity
As part of cleanup of ExternalStorageFormatter.
Bug:
9433509
Change-Id: I4d2bca544e00a549d8c136713da59d07648b9ffe
Julia Reynolds [Thu, 9 Jul 2015 18:57:23 +0000 (18:57 +0000)]
Merge "Talkback improvements for Settings screens." into mnc-dev
Jason Monk [Thu, 9 Jul 2015 18:55:07 +0000 (18:55 +0000)]
Merge "Don't clear data summary when loader is cancelled" into mnc-dev
Jason Monk [Thu, 9 Jul 2015 18:55:03 +0000 (18:55 +0000)]
Merge "Fix rotation issues" into mnc-dev
Zoltan Szatmary-Ban [Thu, 9 Jul 2015 17:33:22 +0000 (17:33 +0000)]
Merge "Check signature match between Cert installer and Settings" into mnc-dev
Julia Reynolds [Wed, 8 Jul 2015 20:56:31 +0000 (16:56 -0400)]
Talkback improvements for Settings screens.
Bug:
21164141
Change-Id: I7444261ccf967f6db70c9fe44a00bd3f19ceb975
Zoltan Szatmary-Ban [Thu, 9 Jul 2015 16:30:20 +0000 (17:30 +0100)]
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
Jason Monk [Thu, 9 Jul 2015 15:22:26 +0000 (11:22 -0400)]
Don't clear data summary when loader is cancelled
Keep whatever summary we had before.
Bug:
22351861
Change-Id: Id2088404f09dcadce1cbf2959918956844d613a7
Zoltan Szatmary-Ban [Thu, 9 Jul 2015 14:37:26 +0000 (15:37 +0100)]
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
Jason Monk [Thu, 9 Jul 2015 14:33:58 +0000 (10:33 -0400)]
Fix rotation issues
Bug:
22373905
Bug:
22311581
Change-Id: Idbed99a3fc0cc64047da151be166ee0ea4c1fb3d
Sasha Levitskiy [Wed, 8 Jul 2015 23:34:26 +0000 (23:34 +0000)]
Merge "Fingerprint: Add post enroll call" into mnc-dev
Sasha Levitskiy [Wed, 8 Jul 2015 22:36:44 +0000 (15:36 -0700)]
Fingerprint: Add post enroll call
Bug
22007124
Change-Id: I670e101a1b7dfa77a4e45022840dfc916fe5ee0d
Signed-off-by: Sasha Levitskiy <sanek@google.com>
Tim Kilbourn [Thu, 11 Jun 2015 23:43:59 +0000 (16:43 -0700)]
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
Jorim Jaggi [Wed, 8 Jul 2015 21:59:00 +0000 (21:59 +0000)]
Merge "Hide screenshot preference when assist is disabled" into mnc-dev
Jeff Sharkey [Wed, 8 Jul 2015 21:55:17 +0000 (21:55 +0000)]
Merge "Move storage when formatting primary disk." into mnc-dev
Jorim Jaggi [Wed, 8 Jul 2015 20:32:12 +0000 (13:32 -0700)]
Hide screenshot preference when assist is disabled
Bug:
22343636
Change-Id: Ic455232dda209f7fadec41aee85903623a4e6bda
Amit Mahajan [Wed, 8 Jul 2015 20:23:45 +0000 (20:23 +0000)]
Merge "Remove 'do not translate' comment for string 'None'." into mnc-dev
Amit Mahajan [Wed, 8 Jul 2015 18:07:34 +0000 (11:07 -0700)]
Remove 'do not translate' comment for string 'None'.
Bug:
22278463
Change-Id: I29c288cd36cd7b65132b42a4b78749afa81064d6
Sanket Padawe [Wed, 8 Jul 2015 17:15:56 +0000 (17:15 +0000)]
Merge "Locale based string changes in BT." into mnc-dev
Sanket Padawe [Wed, 8 Jul 2015 17:14:54 +0000 (17:14 +0000)]
Merge "Disable CA certificate for EAP-SIM, AKA & AKA'" into mnc-dev
Robin Lee [Wed, 8 Jul 2015 16:17:22 +0000 (16:17 +0000)]
Merge "Restore Vpn advanced options on re-init or rotate" into mnc-dev
Geoff Mendal [Wed, 8 Jul 2015 15:39:31 +0000 (15:39 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Wed, 8 Jul 2015 15:19:19 +0000 (08:19 -0700)]
Import translations. DO NOT MERGE
Change-Id: I442dee3b1b41104a76dc1293208010feb77dba7e
Auto-generated-cl: translation import
Jason Monk [Wed, 8 Jul 2015 13:34:40 +0000 (13:34 +0000)]
Merge "Handle uninstall from notifications list" into mnc-dev
Zoltan Szatmary-Ban [Wed, 8 Jul 2015 11:45:03 +0000 (11:45 +0000)]
Merge "Filter USB options on chooser when DISALLOW_USB_FILE_TRANSFER is on" into mnc-dev
Zoltan Szatmary-Ban [Wed, 8 Jul 2015 10:54:05 +0000 (10:54 +0000)]
Merge "Making Settings > Storage multiprofile aware" into mnc-dev
Jeff Sharkey [Wed, 8 Jul 2015 05:14:15 +0000 (22:14 -0700)]
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
Christopher Tate [Tue, 7 Jul 2015 23:35:52 +0000 (23:35 +0000)]
Merge "App link handling is not just for "official" verified handlers" into mnc-dev
Christopher Tate [Wed, 1 Jul 2015 23:52:43 +0000 (16:52 -0700)]
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
Amith Yamasani [Tue, 7 Jul 2015 20:20:03 +0000 (20:20 +0000)]
Merge "Use localized name for guest user" into mnc-dev
Robin Lee [Tue, 7 Jul 2015 19:33:45 +0000 (12:33 -0700)]
Match getLegacyVpn calls to changed interface
The userId argument is now explicit. Pre-requisite for bug
21499103
Change-Id: Ib83e9615326ea484ef6d63fb1a1d9c1659999dab
Zoltan Szatmary-Ban [Wed, 1 Jul 2015 15:45:34 +0000 (16:45 +0100)]
Making Settings > Storage multiprofile aware
Also fixing the order of preferences there.
Bug:
22223456
Bug:
22117317
Change-Id: I9261fe46bfce518fd1ce3d0faef07cffe6869e34
Sanket Padawe [Tue, 7 Jul 2015 19:13:08 +0000 (12:13 -0700)]
Locale based string changes in BT.
Bug:
22219203
Change-Id: Ic920621baf769032475da32ea425097aafa0922e
Jason Monk [Tue, 7 Jul 2015 18:57:47 +0000 (14:57 -0400)]
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
Amith Yamasani [Tue, 7 Jul 2015 17:13:12 +0000 (10:13 -0700)]
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
Zoltan Szatmary-Ban [Tue, 7 Jul 2015 12:24:07 +0000 (13:24 +0100)]
Filter USB options on chooser when DISALLOW_USB_FILE_TRANSFER is on
Bug:
22291579
Change-Id: I32611404ef5f58c7484fe5c4b7a4f7782cc8daa3
Sanket Padawe [Mon, 6 Jul 2015 23:14:43 +0000 (16:14 -0700)]
Disable CA certificate for EAP-SIM, AKA & AKA'
Bug:
21877800
Change-Id: I66dbb12ebcf94c094d2a71d91d8b2eeef8cf6f48
Jorim Jaggi [Mon, 6 Jul 2015 20:48:39 +0000 (20:48 +0000)]
Merge "Text changes to assist & voice input" into mnc-dev