OSDN Git Service
Maurice Lam [Wed, 15 Jul 2015 22:32:43 +0000 (22:32 +0000)]
am
e63322f6: resolved conflicts for merge of
f90628c6 to mnc-dr-dev
* commit '
e63322f640cf955ba296e064b07e4920d334f851':
[Fingerprint] Export FingerprintEnrollIntroduction
Maurice Lam [Wed, 15 Jul 2015 21:57:06 +0000 (14:57 -0700)]
resolved conflicts for merge of
f90628c6 to mnc-dr-dev
Change-Id: I3b0729b1d00a4ca25d3a7127e27b4fc3a062d30d
Maurice Lam [Wed, 15 Jul 2015 18:45:33 +0000 (18:45 +0000)]
Merge "[Fingerprint] Export FingerprintEnrollIntroduction" into mnc-dev
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)
Jason Monk [Wed, 15 Jul 2015 15:22:19 +0000 (15:22 +0000)]
am
b6cb215c: am
cd075edf: Merge "Fix Help menu for PrivateVolumeSettings" into mnc-dev
* commit '
b6cb215cbefc803b0a1510a7f7c606d4d5c10045':
Fix Help menu for PrivateVolumeSettings
Jason Monk [Wed, 15 Jul 2015 15:08:44 +0000 (15:08 +0000)]
am
cd075edf: Merge "Fix Help menu for PrivateVolumeSettings" into mnc-dev
* commit '
cd075edf6dcff9ca9ff243760e032190acbdecdc':
Fix Help menu for PrivateVolumeSettings
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 14:35:26 +0000 (14:35 +0000)]
am
78aeabe8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
78aeabe834c6efacbbb7712bdbdd100917e356f3':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 15 Jul 2015 14:16:17 +0000 (14:16 +0000)]
am
4c60755b: (-s ours) am
f3907176: (-s ours) Import translations. DO NOT MERGE
* commit '
4c60755b310dfb54a1eb748fe184f6e928295b3d':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 15 Jul 2015 14:15:33 +0000 (14:15 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Wed, 15 Jul 2015 14:14:40 +0000 (07:14 -0700)]
Import translations. DO NOT MERGE
Change-Id: I451d2757ef702a046bc62ee5940e510fa0b739ee
Auto-generated-cl: translation import
Geoff Mendal [Wed, 15 Jul 2015 14:07:41 +0000 (14:07 +0000)]
am
f3907176: (-s ours) Import translations. DO NOT MERGE
* commit '
f3907176da3f17397f61bf48ba90ab08a9cd85f3':
Import translations. DO NOT MERGE
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 23:26:08 +0000 (23:26 +0000)]
am
7e23bae6: am
d7fb46de: Merge "Need to disable 5GHz bands for WiFi tethering in Japan" into mnc-dev
* commit '
7e23bae6c6d8697c1f53ed4a3b8b467d3142fd76':
Need to disable 5GHz bands for WiFi tethering in Japan
xinhe [Tue, 14 Jul 2015 23:13:03 +0000 (23:13 +0000)]
am
d7fb46de: Merge "Need to disable 5GHz bands for WiFi tethering in Japan" into mnc-dev
* commit '
d7fb46de591943c402dd13551ca603081ac4e6a7':
Need to disable 5GHz bands for WiFi tethering in Japan
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:33:14 +0000 (21:33 +0000)]
am
a41eb2fa: am
e641e7d7: Merge "Postpone call to postEnroll() until we actually leave activity." into mnc-dev
* commit '
a41eb2faaa4f86b77fe6fa2273f4a84216b5920c':
Postpone call to postEnroll() until we actually leave activity.
Jim Miller [Tue, 14 Jul 2015 21:18:39 +0000 (21:18 +0000)]
am
e641e7d7: Merge "Postpone call to postEnroll() until we actually leave activity." into mnc-dev
* commit '
e641e7d706095b54ac89f6fcb58c66e2190f46c7':
Postpone call to postEnroll() until we actually leave activity.
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:47:33 +0000 (20:47 +0000)]
am
fd44d346: am
acc70a3a: Merge "Add content description to wifi networks" into mnc-dev
* commit '
fd44d346bcaae6e8267aa4767ad70037d436e1e4':
Add content description to wifi networks
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
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:51:58 +0000 (18:51 +0000)]
am
de784e6a: 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 '
de784e6ab5e86eb780cdeee4a2f01e2db9a1ef07':
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: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:13:27 +0000 (18:13 +0000)]
am
464e54f8: am
8505d4a5: Merge "Disable voice input if assist is voice service" into mnc-dev
* commit '
464e54f88b4aa933a7d26cb1afecf0ddfc282751':
Disable voice input if assist is voice service
Wei Liu [Tue, 14 Jul 2015 18:08:32 +0000 (18:08 +0000)]
Merge "Move AppItem, ChartData, ChartDataLoader from Settings to SettingsLib." into cw-e-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:18:00 +0000 (14:18 +0000)]
am
19186edd: am
7713fe26: Merge "Disable notification volume when user restricted" into mnc-dev
* commit '
19186edddb32efc43e7f00faea0436c36b702290':
Disable notification volume when user restricted
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 10:13:58 +0000 (10:13 +0000)]
am
35738049: am
8d9bb1ae: Merge "Fix up Tap and Pay how it works." into mnc-dev
* commit '
35738049df5aa6b14ef0721375cf40c5e7c60539':
Fix up Tap and Pay how it works.
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:34:50 +0000 (23:34 +0000)]
am
5250cc00: am
53dd1d4d: Merge "Fix app icon size" into mnc-dev
* commit '
5250cc0007291bd946d6ac582d34af3440a8392f':
Fix app icon size
Sanket Padawe [Mon, 13 Jul 2015 23:34:48 +0000 (23:34 +0000)]
am
2db9291e: am
7995ca41: Use same technology type for LTE/4G
* commit '
2db9291ea4ba1d880ebcc976c65b12dd24d080ad':
Use same technology type for LTE/4G
Chris Wren [Mon, 13 Jul 2015 23:34:47 +0000 (23:34 +0000)]
am
b6d8b5f6: am
2f8bb8ea: Merge "import new view enums into MetricsLogger" into mnc-dev
* commit '
b6d8b5f6a4dfd5838f9e35d9ddd840e80f5bfec6':
import new view enums into MetricsLogger
Geoff Mendal [Mon, 13 Jul 2015 23:34:46 +0000 (23:34 +0000)]
am
d8b05ce2: (-s ours) am
536ed184: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
d8b05ce25f1f4c3d0686b4a45f8c5ba8bcec6fbb':
Import translations. DO NOT MERGE
Zoltan Szatmary-Ban [Mon, 13 Jul 2015 23:34:45 +0000 (23:34 +0000)]
am
c968c407: am
098c296d: Merge "Do not throw exception when MeasurementDetails.mediaSize is empty" into mnc-dev
* commit '
c968c407f809f06dda02dffe25ea2a4ee9f4cb15':
Do not throw exception when MeasurementDetails.mediaSize is empty
Geoff Mendal [Mon, 13 Jul 2015 23:34:44 +0000 (23:34 +0000)]
am
92a33ff7: (-s ours) am
da15ade8: (-s ours) Import translations. DO NOT MERGE
* commit '
92a33ff73e5447fe89ed091e96efb07f8e6cfcfd':
Import translations. DO NOT MERGE
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
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
Maurice Lam [Mon, 13 Jul 2015 22:34:42 +0000 (22:34 +0000)]
am
c6178ba0: Merge "[Fingerprint] Export FingerprintEnrollIntroduction" into mnc-dr-dev
* commit '
c6178ba01236b60e90cc993103c633ea7eca299d':
[Fingerprint] Export FingerprintEnrollIntroduction
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
Wei Liu [Mon, 13 Jul 2015 19:01:42 +0000 (12:01 -0700)]
Move AppItem, ChartData, ChartDataLoader from Settings to SettingsLib.
Change-Id: Id6189e600eb2adb67f31d079a5a5ecfc99addccc
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 15:11:43 +0000 (15:11 +0000)]
am
a52bf201: (-s ours) Import translations. DO NOT MERGE
* commit '
a52bf2017292a6da41d9b6950a1564710a94367e':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 13 Jul 2015 15:10:40 +0000 (15:10 +0000)]
am
7174a3d7: (-s ours) Import translations. DO NOT MERGE
* commit '
7174a3d7011fa4456bebe7e7b55f47aaed013d29':
Import translations. DO NOT MERGE
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:26:09 +0000 (19:26 +0000)]
am
d3b6832e: am
7ba46433: Merge "Match getLegacyVpn calls to changed interface" into mnc-dev
* commit '
d3b6832edb5530b23132e054135c7fe93f5f9384':
Match getLegacyVpn calls to changed interface
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
Rubin Xu [Fri, 10 Jul 2015 19:16:48 +0000 (19:16 +0000)]
am
8b9a9519: am
331b9823: Merge "Remove unused MediaFormat activity" into mnc-dev
* commit '
8b9a9519c865d73ce10a5847b3b99b3cd339114e':
Remove unused MediaFormat activity
Robin Lee [Fri, 10 Jul 2015 19:05:36 +0000 (19:05 +0000)]
Merge "Match getLegacyVpn calls to changed interface" into mnc-dev
Jason Monk [Fri, 10 Jul 2015 19:04:47 +0000 (19:04 +0000)]
am
c07450ae: am
7ab3cf94: Merge "Fix wifi not re-ordering" into mnc-dev
* commit '
c07450ae7449dd995499dd7cfd5c9367914d6b95':
Fix wifi not re-ordering
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 17:06:34 +0000 (17:06 +0000)]
am
a368f9a9: am
ddd887af: Prevent crash when removing an account.
* commit '
a368f9a97405b6358515186614cd9f450119f937':
Prevent crash when removing an account.
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:25:24 +0000 (19:25 +0000)]
am
df778e8e: am
963e3fdd: Merge "Talkback improvements for Settings screens." into mnc-dev
* commit '
df778e8e76ca41c517385b8c30a468eecc37d107':
Talkback improvements for Settings screens.
Jason Monk [Thu, 9 Jul 2015 19:25:22 +0000 (19:25 +0000)]
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
Jason Monk [Thu, 9 Jul 2015 19:25:19 +0000 (19:25 +0000)]
am
e60ad922: am
b6b85325: Merge "Fix rotation issues" into mnc-dev
* commit '
e60ad922de334286cfd36c7f3939d34096e69049':
Fix rotation issues
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 18:00:03 +0000 (18:00 +0000)]
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
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