OSDN Git Service
Billy Lau [Tue, 21 Jul 2015 18:21:45 +0000 (18:21 +0000)]
am
bc3695c2: am
e267fb31: am
d06ba151: Merge "Bug
21589105 Rescope WRITE_SETTINGS (UX and Settings app change)..." into mnc-dev
* commit '
bc3695c231a5a16f45059e0e561a35d49353afc5':
Bug
21589105 Rescope WRITE_SETTINGS (UX and Settings app change)...
Billy Lau [Tue, 21 Jul 2015 18:06:42 +0000 (18:06 +0000)]
am
e267fb31: am
d06ba151: Merge "Bug
21589105 Rescope WRITE_SETTINGS (UX and Settings app change)..." into mnc-dev
* commit '
e267fb3119754f205bf8518a6c00d3e957b0e45f':
Bug
21589105 Rescope WRITE_SETTINGS (UX and Settings app change)...
Billy Lau [Tue, 21 Jul 2015 17:54:00 +0000 (17:54 +0000)]
am
d06ba151: Merge "Bug
21589105 Rescope WRITE_SETTINGS (UX and Settings app change)..." into mnc-dev
* commit '
d06ba151f5cc966bf05b2ac0146602d31ae81c4a':
Bug
21589105 Rescope WRITE_SETTINGS (UX and Settings app change)...
Billy Lau [Tue, 21 Jul 2015 17:37:05 +0000 (17:37 +0000)]
Merge "Bug
21589105 Rescope WRITE_SETTINGS (UX and Settings app change)..." into mnc-dev
Amit Mahajan [Tue, 21 Jul 2015 17:30:59 +0000 (17:30 +0000)]
am
c5459430: am
480692fa: am
e8357caa: Merge "Fix bug to force to close once change Bearer on APN" into mnc-dev
* commit '
c5459430a08351544e6545a16aa07147b186ec7b':
Fix bug to force to close once change Bearer on APN
Amit Mahajan [Tue, 21 Jul 2015 17:17:45 +0000 (17:17 +0000)]
am
480692fa: am
e8357caa: Merge "Fix bug to force to close once change Bearer on APN" into mnc-dev
* commit '
480692fab398a080be6648ddf424b3129f2c6cbc':
Fix bug to force to close once change Bearer on APN
Amit Mahajan [Tue, 21 Jul 2015 17:09:12 +0000 (17:09 +0000)]
am
e8357caa: Merge "Fix bug to force to close once change Bearer on APN" into mnc-dev
* commit '
e8357caad8880deb23dc04ad5d4d036d41a1ae9f':
Fix bug to force to close once change Bearer on APN
Amit Mahajan [Tue, 21 Jul 2015 16:57:12 +0000 (16:57 +0000)]
Merge "Fix bug to force to close once change Bearer on APN" into mnc-dev
Billy Lau [Tue, 21 Jul 2015 15:43:17 +0000 (16:43 +0100)]
Bug
21589105 Rescope WRITE_SETTINGS (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 needing this capability can
launch the summary UX through a specific intent.
AndroidManifest:
Adds the proper intent-filter so that apps can launch the Settings page using
intent.
strings.xml:
Increased the CHAR limits for some strings due to requests from translators.
Change-Id: Ie64f86e034867ed582c1c583a5e8f84671fa4d63
Julia Reynolds [Tue, 21 Jul 2015 15:57:46 +0000 (15:57 +0000)]
am
6712be4a: am
d409b700: am
f516e7dd: Make \'fingerprint\' searchable in Settings.
* commit '
6712be4a70ecd9d21ae78bf7dc65afc92b277937':
Make 'fingerprint' searchable in Settings.
Julia Reynolds [Tue, 21 Jul 2015 15:44:21 +0000 (15:44 +0000)]
am
d409b700: am
f516e7dd: Make \'fingerprint\' searchable in Settings.
* commit '
d409b70093211df215bc117ccf9ba8d0924e983f':
Make 'fingerprint' searchable in Settings.
Julia Reynolds [Tue, 21 Jul 2015 15:31:17 +0000 (15:31 +0000)]
am
f516e7dd: Make \'fingerprint\' searchable in Settings.
* commit '
f516e7dde0074416dbf51650cbfb9cc763027b27':
Make 'fingerprint' searchable in Settings.
Julia Reynolds [Thu, 16 Jul 2015 19:33:22 +0000 (15:33 -0400)]
Make 'fingerprint' searchable in Settings.
Bug:
22511754
Change-Id: I1e145ca9a33eb336014a8a4e158e9196a91cfdcc
Maurice Lam [Tue, 21 Jul 2015 01:19:47 +0000 (01:19 +0000)]
am
c690d199: am
d5af0d8b: am
d85fafce: Merge "[ScreenLock] Change title of encryption interstitial" into mnc-dev
* commit '
c690d199be82337f3909348443391bbad081d37f':
[ScreenLock] Change title of encryption interstitial
Maurice Lam [Tue, 21 Jul 2015 01:04:50 +0000 (01:04 +0000)]
am
e82793a2: am
6132fe1c: am
d10026cb: Merge "[Fingerprint] Change message in encryption" into mnc-dev
* commit '
e82793a2de48be5334f3892d96e1e2736a3064c0':
[Fingerprint] Change message in encryption
Maurice Lam [Tue, 21 Jul 2015 01:04:49 +0000 (01:04 +0000)]
am
135c8869: am
8ebd1e2c: am
af57ec88: Merge "[ScreenLock] Change title for RedactionInterstitial" into mnc-dev
* commit '
135c8869fe4cc2cad8df07172c2f225da23ef07e':
[ScreenLock] Change title for RedactionInterstitial
Maurice Lam [Tue, 21 Jul 2015 01:04:47 +0000 (01:04 +0000)]
am
d5af0d8b: am
d85fafce: Merge "[ScreenLock] Change title of encryption interstitial" into mnc-dev
* commit '
d5af0d8b8a973a2f82024f5358572b609e47a758':
[ScreenLock] Change title of encryption interstitial
Maurice Lam [Tue, 21 Jul 2015 00:49:50 +0000 (00:49 +0000)]
am
6132fe1c: am
d10026cb: Merge "[Fingerprint] Change message in encryption" into mnc-dev
* commit '
6132fe1c02a944bf87604a4773e091124de4954d':
[Fingerprint] Change message in encryption
Maurice Lam [Tue, 21 Jul 2015 00:49:49 +0000 (00:49 +0000)]
am
8ebd1e2c: am
af57ec88: Merge "[ScreenLock] Change title for RedactionInterstitial" into mnc-dev
* commit '
8ebd1e2c06d8526dd8a3081d743bc77ee565fc10':
[ScreenLock] Change title for RedactionInterstitial
Maurice Lam [Tue, 21 Jul 2015 00:49:46 +0000 (00:49 +0000)]
am
d85fafce: Merge "[ScreenLock] Change title of encryption interstitial" into mnc-dev
* commit '
d85fafce30f6fb71ea9de9de3c6d8aafc99dba33':
[ScreenLock] Change title of encryption interstitial
Maurice Lam [Tue, 21 Jul 2015 00:38:38 +0000 (00:38 +0000)]
Merge "[ScreenLock] Change title of encryption interstitial" into mnc-dev
Maurice Lam [Tue, 21 Jul 2015 00:33:23 +0000 (00:33 +0000)]
am
d10026cb: Merge "[Fingerprint] Change message in encryption" into mnc-dev
* commit '
d10026cbfde671448b702fde345da52ac7569d04':
[Fingerprint] Change message in encryption
Maurice Lam [Tue, 21 Jul 2015 00:33:22 +0000 (00:33 +0000)]
am
af57ec88: Merge "[ScreenLock] Change title for RedactionInterstitial" into mnc-dev
* commit '
af57ec8831d3047400a6bcbc8c5e73fc3888b7d3':
[ScreenLock] Change title for RedactionInterstitial
Maurice Lam [Tue, 21 Jul 2015 00:22:34 +0000 (00:22 +0000)]
Merge "[Fingerprint] Change message in encryption" into mnc-dev
Maurice Lam [Tue, 21 Jul 2015 00:22:02 +0000 (00:22 +0000)]
Merge "[ScreenLock] Change title for RedactionInterstitial" into mnc-dev
Sungmin Choi [Mon, 20 Jul 2015 21:08:12 +0000 (14:08 -0700)]
Fix bug to force to close once change Bearer on APN
Bug:
22544257
Change-Id: I43eea4034c3d106b8e3f8e4f999f389db04b7567
Maurice Lam [Mon, 20 Jul 2015 22:35:21 +0000 (15:35 -0700)]
[ScreenLock] Change title for RedactionInterstitial
Change the title for RedactionInterstital to "Notifications".
Bug:
22587892
Change-Id: Ib0e32fa8913924ae74aa412703a5f6234fd62fe4
Jim Miller [Mon, 20 Jul 2015 23:28:14 +0000 (23:28 +0000)]
am
a8f88798: am
d74a3603: am
3977df03: Merge "Don\'t launch ConfirmDeviceCredentials multiple times." into mnc-dev
* commit '
a8f8879895edd86fd206fc1a8d2d684e09fcc57f':
Don't launch ConfirmDeviceCredentials multiple times.
Jim Miller [Mon, 20 Jul 2015 23:20:15 +0000 (23:20 +0000)]
am
d74a3603: am
3977df03: Merge "Don\'t launch ConfirmDeviceCredentials multiple times." into mnc-dev
* commit '
d74a36031cbe87a8a18f4ffc99aaa399245f181c':
Don't launch ConfirmDeviceCredentials multiple times.
Geoff Mendal [Mon, 20 Jul 2015 23:06:47 +0000 (23:06 +0000)]
am
e4af992f: (-s ours) am
a74f78b1: (-s ours) am
1992d5a1: (-s ours) Import translations. DO NOT MERGE
* commit '
e4af992fef82ab26670db5adc7957b4385baa86c':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 20 Jul 2015 23:06:46 +0000 (23:06 +0000)]
am
a6e9efbe: (-s ours) am
4a0662dd: (-s ours) Import translations. DO NOT MERGE
* commit '
a6e9efbeb3bd83db0ad5d45a2bafb306935e02dd':
Import translations. DO NOT MERGE
Jim Miller [Mon, 20 Jul 2015 23:05:51 +0000 (23:05 +0000)]
am
3977df03: Merge "Don\'t launch ConfirmDeviceCredentials multiple times." into mnc-dev
* commit '
3977df037c1cdd1bef92e3f4195c6e7b847a1c28':
Don't launch ConfirmDeviceCredentials multiple times.
Geoff Mendal [Mon, 20 Jul 2015 22:57:40 +0000 (22:57 +0000)]
am
a74f78b1: (-s ours) am
1992d5a1: (-s ours) Import translations. DO NOT MERGE
* commit '
a74f78b188d11b0dfd7651aff77b2db4eae0278e':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 20 Jul 2015 22:57:38 +0000 (22:57 +0000)]
am
4a0662dd: (-s ours) Import translations. DO NOT MERGE
* commit '
4a0662dddeeea4fa9a62a97b5dd9e996860db7cd':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 20 Jul 2015 22:52:48 +0000 (22:52 +0000)]
am
1992d5a1: (-s ours) Import translations. DO NOT MERGE
* commit '
1992d5a1fc616f5132315ee6d4659c20728acad6':
Import translations. DO NOT MERGE
Jim Miller [Mon, 20 Jul 2015 22:50:29 +0000 (22:50 +0000)]
Merge "Don't launch ConfirmDeviceCredentials multiple times." into mnc-dev
Geoff Mendal [Mon, 20 Jul 2015 22:41:29 +0000 (15:41 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ief6e249d326487904a789fa2b33e6d775b7b2bd7
Auto-generated-cl: translation import
Jim Miller [Mon, 20 Jul 2015 22:36:21 +0000 (15:36 -0700)]
Don't launch ConfirmDeviceCredentials multiple times.
Fixes bug
18724944
Change-Id: Ifd93b1632f120a2d17136b3100e2563fbb45b9a5
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
Maurice Lam [Mon, 20 Jul 2015 22:03:37 +0000 (15:03 -0700)]
[ScreenLock] Change title of encryption interstitial
Change the title of EncryptionInterstitial to "Secure start-up".
Bug:
22587892
Change-Id: I30b9625bb2da666cd5e229445ad369fe72faad51
Maurice Lam [Mon, 20 Jul 2015 21:49:29 +0000 (14:49 -0700)]
[Fingerprint] Change message in encryption
Change the message for encryption interstitial when enrollin
fingerprint, to make it clear that fingerprint unlock is still used,
just that the backup unlock PIN / password / pattern will be needed
to start the device.
Bug:
22559146
Change-Id: Ia134e0d9b118151833a9118ff44667dcc9122185
Makoto Onuki [Mon, 20 Jul 2015 21:23:38 +0000 (21:23 +0000)]
am
f9b46965: am
75842ffc: am
4dd637a0: Merge "Fix ugly text wrapping on non-english locales" into mnc-dev
* commit '
f9b46965b7c3e2fb7985669f3a2b1bdeed06a2c3':
Fix ugly text wrapping on non-english locales
Jason Monk [Mon, 20 Jul 2015 21:23:37 +0000 (21:23 +0000)]
am
b48e56c9: am
959a7380: am
178c4099: Merge "Handle monkey crash" into mnc-dev
* commit '
b48e56c9b232710c2de0fa852d7230e9b0a191d7':
Handle monkey crash
Makoto Onuki [Mon, 20 Jul 2015 21:08:05 +0000 (21:08 +0000)]
am
75842ffc: am
4dd637a0: Merge "Fix ugly text wrapping on non-english locales" into mnc-dev
* commit '
75842ffc9a8a41425b69e1e1ad77ffde14ed4749':
Fix ugly text wrapping on non-english locales
Jason Monk [Mon, 20 Jul 2015 21:08:04 +0000 (21:08 +0000)]
am
959a7380: am
178c4099: Merge "Handle monkey crash" into mnc-dev
* commit '
959a7380f15ea95ccba6d7d6ae30fee8f312bb84':
Handle monkey crash
Makoto Onuki [Mon, 20 Jul 2015 20:46:02 +0000 (20:46 +0000)]
am
4dd637a0: Merge "Fix ugly text wrapping on non-english locales" into mnc-dev
* commit '
4dd637a07e7eba9341d85c21fbb1fccac7e685c3':
Fix ugly text wrapping on non-english locales
Jason Monk [Mon, 20 Jul 2015 20:46:01 +0000 (20:46 +0000)]
am
178c4099: Merge "Handle monkey crash" into mnc-dev
* commit '
178c40998df2d5196bc5913fca831880cfa47c50':
Handle monkey crash
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
Christopher Tate [Mon, 20 Jul 2015 17:59:35 +0000 (17:59 +0000)]
am
7cce6d0c: am
f330857a: am
b852fcbd: Merge "Offer \'ask\' as an available app-linking state" into mnc-dev
* commit '
7cce6d0c529bf9d3820b1fc4d8b5ad364a74a478':
Offer 'ask' as an available app-linking state
Christopher Tate [Mon, 20 Jul 2015 17:41:08 +0000 (17:41 +0000)]
am
f330857a: am
b852fcbd: Merge "Offer \'ask\' as an available app-linking state" into mnc-dev
* commit '
f330857a17d29cec33ca0169cb30fdc69854ab52':
Offer 'ask' as an available app-linking state
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:24:02 +0000 (17:24 +0000)]
am
b852fcbd: Merge "Offer \'ask\' as an available app-linking state" into mnc-dev
* commit '
b852fcbde9f5e0d92f5fc2ac8fc088eb114e3b63':
Offer 'ask' as an available app-linking state
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
Geoff Mendal [Mon, 20 Jul 2015 15:00:21 +0000 (15:00 +0000)]
am
e9c77337: (-s ours) am
9c314f05: (-s ours) Import translations. DO NOT MERGE
* commit '
e9c773371d45640868978cc7722295c228b9089e':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 20 Jul 2015 14:45:23 +0000 (14:45 +0000)]
am
9c314f05: (-s ours) Import translations. DO NOT MERGE
* commit '
9c314f05f85ffe6918bcd9d0747903dc6786dfc0':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 20 Jul 2015 14:01:44 +0000 (07:01 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ibd37f1c6a32c600eaf7b410891ba81814589ea04
Auto-generated-cl: translation import
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:42:07 +0000 (21:42 +0000)]
am
64117fef: am
4b3bc882: am
bf9a425d: Merge "Simplify FingerprintSettings" into mnc-dev
* commit '
64117fef33b0e73690a6cddf38992ea5b82d10db':
Simplify FingerprintSettings
Jim Miller [Fri, 17 Jul 2015 21:30:11 +0000 (21:30 +0000)]
am
4b3bc882: am
bf9a425d: Merge "Simplify FingerprintSettings" into mnc-dev
* commit '
4b3bc882ad2824a1f7d4362d8757ddb9c7ba21ce':
Simplify FingerprintSettings
Jim Miller [Fri, 17 Jul 2015 21:15:57 +0000 (21:15 +0000)]
am
bf9a425d: Merge "Simplify FingerprintSettings" into mnc-dev
* commit '
bf9a425d5c3f61f02133084d11ab8481b0f53102':
Simplify FingerprintSettings
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:53:54 +0000 (20:53 +0000)]
am
03b1b4f3: am
8560ae2f: am
0c03b50a: Merge "Remove blank switchtext from switch preferences." into mnc-dev
* commit '
03b1b4f33f9101d95f0e881ffebec24a99498eb0':
Remove blank switchtext from switch preferences.
Julia Reynolds [Fri, 17 Jul 2015 20:40:19 +0000 (20:40 +0000)]
am
8560ae2f: am
0c03b50a: Merge "Remove blank switchtext from switch preferences." into mnc-dev
* commit '
8560ae2f8752f611ffee651289519a7993b3e500':
Remove blank switchtext from switch preferences.
Julia Reynolds [Fri, 17 Jul 2015 20:27:24 +0000 (20:27 +0000)]
am
0c03b50a: Merge "Remove blank switchtext from switch preferences." into mnc-dev
* commit '
0c03b50a02007499208603733e597f72aa9a59c2':
Remove blank switchtext from switch preferences.
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 19:09:06 +0000 (19:09 +0000)]
am
e5a95396: am
e104fced: am
90a8a01b: Merge "Bug
21589105 Rescope SYSTEM_ALERT_WINDOW (UX and Settings app change)..." into mnc-dev
* commit '
e5a95396da082a3ba432c5d8ed5a7baa2eacd55c':
Bug
21589105 Rescope SYSTEM_ALERT_WINDOW (UX and Settings app change)...
Billy Lau [Fri, 17 Jul 2015 18:57:51 +0000 (18:57 +0000)]
am
e104fced: am
90a8a01b: Merge "Bug
21589105 Rescope SYSTEM_ALERT_WINDOW (UX and Settings app change)..." into mnc-dev
* commit '
e104fced18056905286ee01a3ef8c3d12f2b9e4d':
Bug
21589105 Rescope SYSTEM_ALERT_WINDOW (UX and Settings app change)...
Billy Lau [Fri, 17 Jul 2015 18:39:23 +0000 (18:39 +0000)]
am
90a8a01b: Merge "Bug
21589105 Rescope SYSTEM_ALERT_WINDOW (UX and Settings app change)..." into mnc-dev
* commit '
90a8a01b629694d28dd7e40a8f0253894fc14e02':
Bug
21589105 Rescope SYSTEM_ALERT_WINDOW (UX and Settings app change)...
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 [Fri, 17 Jul 2015 00:17:06 +0000 (00:17 +0000)]
am
b42eb5e2: am
649cc87f: am
ddaa142a: Intent filters need CATEGORY_BROWSABLE to be app-linking eligible
* commit '
b42eb5e221b9120741f497cc94486dc804ab2cbb':
Intent filters need CATEGORY_BROWSABLE to be app-linking eligible
Christopher Tate [Fri, 17 Jul 2015 00:04:04 +0000 (00:04 +0000)]
am
649cc87f: am
ddaa142a: Intent filters need CATEGORY_BROWSABLE to be app-linking eligible
* commit '
649cc87f994c0010e8fd7567b7cece77ffffb0fd':
Intent filters need CATEGORY_BROWSABLE to be app-linking eligible
Christopher Tate [Thu, 16 Jul 2015 23:50:06 +0000 (23:50 +0000)]
am
ddaa142a: Intent filters need CATEGORY_BROWSABLE to be app-linking eligible
* commit '
ddaa142a094a404d7c5e6d7eea93920f8ed16696':
Intent filters need CATEGORY_BROWSABLE to be app-linking eligible
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 13:30:00 +0000 (13:30 +0000)]
am
00a82a4e: am
29d1b0d0: am
705faddb: Merge "Show disabled trust agents as off." into mnc-dev
* commit '
00a82a4e1b125a25ec3c92e90dbc3de986124813':
Show disabled trust agents as off.
Kenny Guy [Thu, 16 Jul 2015 13:15:57 +0000 (13:15 +0000)]
am
29d1b0d0: am
705faddb: Merge "Show disabled trust agents as off." into mnc-dev
* commit '
29d1b0d0f4e7760ee1ed317b303a6c4ec54adda7':
Show disabled trust agents as off.
Kenny Guy [Thu, 16 Jul 2015 13:02:44 +0000 (13:02 +0000)]
am
705faddb: Merge "Show disabled trust agents as off." into mnc-dev
* commit '
705faddbb37bbaa8dc7a18ab3290c02b5b6a2a2c':
Show disabled trust agents as off.
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:40:25 +0000 (05:40 +0000)]
am
18c31082: am
c5be2243: am
046decca: Merge "Use common xml file for multi-tab settings." into mnc-dev
* commit '
18c31082b397858564f1dc99a785dc77d1814151':
Use common xml file for multi-tab settings.
Sanket Padawe [Thu, 16 Jul 2015 05:27:44 +0000 (05:27 +0000)]
am
c5be2243: am
046decca: Merge "Use common xml file for multi-tab settings." into mnc-dev
* commit '
c5be2243d79ea0a27a7c61ee3aeffdacd7f63b06':
Use common xml file for multi-tab settings.
Sanket Padawe [Thu, 16 Jul 2015 05:14:09 +0000 (05:14 +0000)]
am
046decca: Merge "Use common xml file for multi-tab settings." into mnc-dev
* commit '
046decca29376aba5b97b78900bfd867ca3f310c':
Use common xml file for multi-tab settings.
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:57:00 +0000 (02:57 +0000)]
am
85f199d8: am
021b3d95: am
bec1d295: Merge "[Fingerprint] Use accent color for fingerprint highlight" into mnc-dev
* commit '
85f199d8620c689ae6f0ae94eeda9168fa93c2db':
[Fingerprint] Use accent color for fingerprint highlight
Maurice Lam [Thu, 16 Jul 2015 02:43:11 +0000 (02:43 +0000)]
am
021b3d95: am
bec1d295: Merge "[Fingerprint] Use accent color for fingerprint highlight" into mnc-dev
* commit '
021b3d955f91eeaa03f8f45401663954560dc748':
[Fingerprint] Use accent color for fingerprint highlight
Maurice Lam [Thu, 16 Jul 2015 02:28:09 +0000 (02:28 +0000)]
am
bec1d295: Merge "[Fingerprint] Use accent color for fingerprint highlight" into mnc-dev
* commit '
bec1d295586b752f81f523c8339dcd49c586d722':
[Fingerprint] Use accent color for fingerprint highlight
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 23:30:21 +0000 (23:30 +0000)]
am
543d68cc: am
194e92d3: am
50972605: Merge "Disable ignore battery optimization items that can\'t change" into mnc-dev
* commit '
543d68cc3a68098bface7335266a46d1ae0603ca':
Disable ignore battery optimization items that can't change
Jason Monk [Wed, 15 Jul 2015 23:30:19 +0000 (23:30 +0000)]
am
f9d8deff: am
7beb763d: am
4a6b9095: Merge "Change move storage from dropdown pref to dialog" into mnc-dev
* commit '
f9d8deffaa79da57f04c9eed50d0d1991daac4b1':
Change move storage from dropdown pref to dialog
Jason Monk [Wed, 15 Jul 2015 23:20:43 +0000 (23:20 +0000)]
am
194e92d3: am
50972605: Merge "Disable ignore battery optimization items that can\'t change" into mnc-dev
* commit '
194e92d3a0dcc15056fac17690f2f36bdc96861a':
Disable ignore battery optimization items that can't change
Jason Monk [Wed, 15 Jul 2015 23:20:41 +0000 (23:20 +0000)]
am
7beb763d: am
4a6b9095: Merge "Change move storage from dropdown pref to dialog" into mnc-dev
* commit '
7beb763da239fb71f214cab0587ae52f383985fc':
Change move storage from dropdown pref to dialog
Jason Monk [Wed, 15 Jul 2015 23:03:58 +0000 (23:03 +0000)]
am
50972605: Merge "Disable ignore battery optimization items that can\'t change" into mnc-dev
* commit '
509726054a3efc09d65d6c15f485ea6f1da2d272':
Disable ignore battery optimization items that can't change
Jason Monk [Wed, 15 Jul 2015 23:03:57 +0000 (23:03 +0000)]
am
4a6b9095: Merge "Change move storage from dropdown pref to dialog" into mnc-dev
* commit '
4a6b909559d50e02833afd5119876df070dfd458':
Change move storage from dropdown pref to dialog
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
Maurice Lam [Wed, 15 Jul 2015 22:47:19 +0000 (22:47 +0000)]
am
2ea2950d: am
77352c65: am
4595978b: Merge "[Fingerprint] Add fingerprint enroll in setup wizard" into mnc-dev
* commit '
2ea2950d9c15e2da38d5aece8de7c0079539d99a':
[Fingerprint] Add fingerprint enroll in setup wizard
Jim Miller [Wed, 15 Jul 2015 22:47:18 +0000 (22:47 +0000)]
am
593fe777: am
22e51c8b: am
6b9d7889: Merge "Fixed the layout for the fingerprint renaming" into mnc-dev
* commit '
593fe7778cde419f73d3ec331d028bd86a4f442b':
Fixed the layout for the fingerprint renaming