OSDN Git Service
Jason Monk [Tue, 14 Jul 2015 20:30:19 +0000 (20:30 +0000)]
am
acc70a3a: Merge "Add content description to wifi networks" into mnc-dev
* commit '
acc70a3a3262aef48b2efab90f14328f818a9aef':
Add content description to wifi networks
Jason Monk [Tue, 14 Jul 2015 20:20:31 +0000 (20:20 +0000)]
Merge "Add content description to wifi networks" into mnc-dev
Billy Lau [Tue, 14 Jul 2015 18:36:53 +0000 (18:36 +0000)]
am
52df60d8: 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
* commit '
52df60d83dc48818aacbe1721e6aaa9be39e8451':
Bug:
21589105 Rescoping SYSTEM_ALERT_WINDOW and WRITE_SETTINGS permission to an explicit toggle to be enabled through Settings via Apps -> Advanced Apps.
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
Jorim Jaggi [Tue, 14 Jul 2015 18:04:11 +0000 (18:04 +0000)]
am
8505d4a5: Merge "Disable voice input if assist is voice service" into mnc-dev
* commit '
8505d4a51d1112ea71f7df680cf85378a9567bde':
Disable voice input if assist is voice service
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 14:02:27 +0000 (14:02 +0000)]
am
7713fe26: Merge "Disable notification volume when user restricted" into mnc-dev
* commit '
7713fe26d2151a7ba8e9970d90f55ae184d48b7d':
Disable notification volume when user restricted
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:57:35 +0000 (07:57 +0000)]
am
8d9bb1ae: Merge "Fix up Tap and Pay how it works." into mnc-dev
* commit '
8d9bb1ae1d551699ba85061001ced90a157ae9ad':
Fix up Tap and Pay how it works.
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
Jason Monk [Mon, 13 Jul 2015 23:01:59 +0000 (23:01 +0000)]
am
53dd1d4d: Merge "Fix app icon size" into mnc-dev
* commit '
53dd1d4deea9968f1255018248ff0393252032dd':
Fix app icon size
Sanket Padawe [Mon, 13 Jul 2015 23:01:45 +0000 (23:01 +0000)]
am
7995ca41: Use same technology type for LTE/4G
* commit '
7995ca4165cae43b9bff25a6e6eafdb51445b698':
Use same technology type for LTE/4G
Chris Wren [Mon, 13 Jul 2015 23:01:29 +0000 (23:01 +0000)]
am
2f8bb8ea: Merge "import new view enums into MetricsLogger" into mnc-dev
* commit '
2f8bb8ea97e87cacbe307c1d78fa7a6e096530eb':
import new view enums into MetricsLogger
Geoff Mendal [Mon, 13 Jul 2015 23:01:18 +0000 (23:01 +0000)]
am
536ed184: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
536ed1847863776335576699cdbe828b62f35a0f':
Import translations. DO NOT MERGE
Zoltan Szatmary-Ban [Mon, 13 Jul 2015 23:01:11 +0000 (23:01 +0000)]
am
098c296d: Merge "Do not throw exception when MeasurementDetails.mediaSize is empty" into mnc-dev
* commit '
098c296df2388bbcc906e8e149743eea7467b0a8':
Do not throw exception when MeasurementDetails.mediaSize is empty
Geoff Mendal [Mon, 13 Jul 2015 23:00:39 +0000 (23:00 +0000)]
am
da15ade8: (-s ours) Import translations. DO NOT MERGE
* commit '
da15ade8300bb875b8d874e1f68032f6ffe95719':
Import translations. DO NOT MERGE
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
Maurice Lam [Mon, 13 Jul 2015 20:20:56 +0000 (20:20 +0000)]
Merge "[Fingerprint] Export FingerprintEnrollIntroduction" into mnc-dr-dev
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 14:08:00 +0000 (07:08 -0700)]
Import translations. DO NOT MERGE
Change-Id: I75a6759a8ccd3a922121912e0c2bdb291fda3e56
Auto-generated-cl: translation import
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 18:37:38 +0000 (13:37 -0500)]
Import translations. DO NOT MERGE
Change-Id: I73a807d112306b787b9975ee0c2560a2431f031b
Auto-generated-cl: translation import
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
Maurice Lam [Wed, 8 Jul 2015 23:59:59 +0000 (16:59 -0700)]
[Fingerprint] Export FingerprintEnrollIntroduction
Export FingerprintEnrollIntroduction activity under the permission
USE_FINGERPRINT so that setup wizard can start it.
Bug:
21695577
Change-Id: If466c6e484a4aa0c10382cfedab0aad10ae26702
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:16:57 +0000 (19:16 +0000)]
am
7ba46433: Merge "Match getLegacyVpn calls to changed interface" into mnc-dev
* commit '
7ba46433aefad363a1d2e75d4a12f2886c6d0315':
Match getLegacyVpn calls to changed interface
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 19:03:19 +0000 (19:03 +0000)]
am
331b9823: Merge "Remove unused MediaFormat activity" into mnc-dev
* commit '
331b9823d0a686d414f181ed406181d1d4e2aa1a':
Remove unused MediaFormat activity
Jason Monk [Fri, 10 Jul 2015 18:48:32 +0000 (18:48 +0000)]
am
7ab3cf94: Merge "Fix wifi not re-ordering" into mnc-dev
* commit '
7ab3cf944dd8c120555dada4fc490a9fe592f37e':
Fix wifi not re-ordering
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 16:51:37 +0000 (16:51 +0000)]
am
ddd887af: Prevent crash when removing an account.
* commit '
ddd887afc826b82b37ca8bd43c847479c94c07aa':
Prevent crash when removing an account.
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 19:09:25 +0000 (19:09 +0000)]
am
963e3fdd: Merge "Talkback improvements for Settings screens." into mnc-dev
* commit '
963e3fdd05156bb11e6692222b2d08b34c7d126b':
Talkback improvements for Settings screens.
Jason Monk [Thu, 9 Jul 2015 19:09:23 +0000 (19:09 +0000)]
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
Jason Monk [Thu, 9 Jul 2015 19:09:21 +0000 (19:09 +0000)]
am
b6b85325: Merge "Fix rotation issues" into mnc-dev
* commit '
b6b85325e91a3e22dd23d67241adecc359dc0952':
Fix rotation issues
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:49:56 +0000 (17:49 +0000)]
am
ee77eced: Merge "Check signature match between Cert installer and Settings" into mnc-dev
* commit '
ee77eced69fac3e6f94cbb3ce2013d8334c17c90':
Check signature match between Cert installer and Settings
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 15:14:32 +0000 (15:14 +0000)]
am
4bbe3d1f: Update all shown preferences in Settings > Storage
* commit '
4bbe3d1fb66a99bfdf4cad8f2e77df23dccebbbd':
Update all shown preferences in Settings > Storage
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:37:33 +0000 (23:37 +0000)]
am
93b1a5a9: Merge "Fingerprint: Add post enroll call" into mnc-dev
* commit '
93b1a5a974f723f5aa463162b1f5aa43338f8c2e':
Fingerprint: Add post enroll call
Tim Kilbourn [Wed, 8 Jul 2015 23:37:32 +0000 (23:37 +0000)]
am
49983b99: Show correct text for app link domains.
* commit '
49983b991c01af0bc958eee1ddad144b7bde44ec':
Show correct text for app link domains.
Sasha Levitskiy [Wed, 8 Jul 2015 23:34:26 +0000 (23:34 +0000)]
Merge "Fingerprint: Add post enroll call" into mnc-dev
Selim Cinek [Wed, 8 Jul 2015 23:09:51 +0000 (23:09 +0000)]
Merge "Fixed the layout for the fingerprint renaming" into mnc-dr-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>
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
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 22:08:34 +0000 (22:08 +0000)]
am
b493b291: Merge "Hide screenshot preference when assist is disabled" into mnc-dev
* commit '
b493b2910190b95bba6cad0f328a0339acebef9b':
Hide screenshot preference when assist is disabled
Jeff Sharkey [Wed, 8 Jul 2015 22:08:32 +0000 (22:08 +0000)]
am
80eba76b: Merge "Move storage when formatting primary disk." into mnc-dev
* commit '
80eba76b109efa7e48eaf7aac145e05938d4405e':
Move storage when formatting primary disk.
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
Amit Mahajan [Wed, 8 Jul 2015 20:37:19 +0000 (20:37 +0000)]
am
01ce80b5: Merge "Remove \'do not translate\' comment for string \'None\'." into mnc-dev
* commit '
01ce80b574e2404d911750c16a1ddd89c787f3ff':
Remove 'do not translate' comment for string 'None'.
Sanket Padawe [Wed, 8 Jul 2015 20:37:18 +0000 (20:37 +0000)]
am
c7777b94: Merge "Locale based string changes in BT." into mnc-dev
* commit '
c7777b947097160cd89252f1f1e27704d82c25f6':
Locale based string changes in BT.
Sanket Padawe [Wed, 8 Jul 2015 20:37:16 +0000 (20:37 +0000)]
am
c9cdf9c8: Merge "Disable CA certificate for EAP-SIM, AKA & AKA\'" into mnc-dev
* commit '
c9cdf9c814020c777ffec7cfceb5b38c74e091f5':
Disable CA certificate for EAP-SIM, AKA & AKA'
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:27:42 +0000 (16:27 +0000)]
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
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:50:58 +0000 (15:50 +0000)]
am
4a332ee8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
4a332ee8ed15c991e29e46490d2a9d93117bca26':
Import translations. DO NOT MERGE
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:44:38 +0000 (13:44 +0000)]
am
4652115f: Merge "Handle uninstall from notifications list" into mnc-dev
* commit '
4652115f1f75633b0cf3811910b0a5336fd90bf4':
Handle uninstall from notifications list
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:57:34 +0000 (11:57 +0000)]
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
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 11:10:45 +0000 (11:10 +0000)]
am
461a48ba: Merge "Making Settings > Storage multiprofile aware" into mnc-dev
* commit '
461a48bac97c24706fd3b2f789648f61a42def42':
Making Settings > Storage multiprofile aware
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:49:11 +0000 (23:49 +0000)]
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
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:37:31 +0000 (20:37 +0000)]
am
7ac21204: Merge "Use localized name for guest user" into mnc-dev
* commit '
7ac21204e16c797cc4f818ccc51509d425ffaf80':
Use localized name for guest user
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