OSDN Git Service
Doris Ling [Thu, 3 Aug 2017 17:24:50 +0000 (17:24 +0000)]
Merge "Merge "Make account preference icons bigger." into oc-dr1-dev am:
713e4f65bd am:
38264f2144" into oc-mr1-dev-plus-aosp
am:
d7ded8752a
Change-Id: I0516512a9579780f848caffb20e2bedeb3d84ba8
Lei Yu [Thu, 3 Aug 2017 17:24:29 +0000 (17:24 +0000)]
Merge "Merge "Turn on bluetooth anomaly detector" into oc-dr1-dev am:
2750dd8d6d am:
95fc90a45c" into oc-mr1-dev-plus-aosp
am:
2726d7b2cd
Change-Id: I56c9cf1166e7f1b4d06267b920105e988c9fd5ba
Lei Yu [Thu, 3 Aug 2017 17:24:07 +0000 (17:24 +0000)]
Merge "Turn on bluetooth anomaly detector" into oc-dr1-dev am:
2750dd8d6d am:
fab00d4262
am:
aefe48590c
Change-Id: I451c43920bbd844582e1dc4b15231ff28e238243
Android Build Merger (Role) [Thu, 3 Aug 2017 17:14:21 +0000 (17:14 +0000)]
Merge "Merge "Make account preference icons bigger." into oc-dr1-dev am:
713e4f65bd am:
38264f2144" into oc-mr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 3 Aug 2017 17:14:05 +0000 (17:14 +0000)]
Merge "Merge "Turn on bluetooth anomaly detector" into oc-dr1-dev am:
2750dd8d6d am:
95fc90a45c" into oc-mr1-dev-plus-aosp
Doris Ling [Thu, 3 Aug 2017 17:14:04 +0000 (17:14 +0000)]
Merge "Make account preference icons bigger." into oc-dr1-dev am:
713e4f65bd
am:
38264f2144
Change-Id: I19b213d24af184075fe472e297914c247b48280d
Lei Yu [Thu, 3 Aug 2017 17:13:36 +0000 (17:13 +0000)]
Merge "Turn on bluetooth anomaly detector" into oc-dr1-dev am:
2750dd8d6d
am:
fab00d4262
Change-Id: I245198bcb78aca17c33fb24f17778af283d1c9b7
Lei Yu [Thu, 3 Aug 2017 17:13:36 +0000 (17:13 +0000)]
Merge "Turn on bluetooth anomaly detector" into oc-dr1-dev am:
2750dd8d6d
am:
95fc90a45c
Change-Id: Ic6636bf1bf7cfe4561eb38f7081e9dee8235352f
Doris Ling [Thu, 3 Aug 2017 17:08:29 +0000 (17:08 +0000)]
Merge "Make account preference icons bigger." into oc-dr1-dev
am:
713e4f65bd
Change-Id: Ifc4750a60c72667e4611ab7c6fb0bb08b95b967f
Lei Yu [Thu, 3 Aug 2017 17:08:05 +0000 (17:08 +0000)]
Merge "Turn on bluetooth anomaly detector" into oc-dr1-dev
am:
2750dd8d6d
Change-Id: Ifdaaab5254e497839beb4c1eb749b310b5b512ae
Lei Yu [Thu, 3 Aug 2017 17:08:05 +0000 (17:08 +0000)]
Merge "Turn on bluetooth anomaly detector" into oc-dr1-dev
am:
2750dd8d6d
Change-Id: I39fc570ff7af36a55d46aa2d626a94fbba2c1190
Doris Ling [Thu, 3 Aug 2017 17:01:50 +0000 (17:01 +0000)]
Merge "Make account preference icons bigger." into oc-dr1-dev
Ajay Nadathur [Thu, 3 Aug 2017 16:57:05 +0000 (16:57 +0000)]
Merge "Fingerprint added graphic is bigger than enrolling progressbar" into oc-mr1-dev am:
1908c4010b
am:
1f2317c4b4
Change-Id: I1484d56c8215d55e8488074fa997a162b4b7ac15
Lei Yu [Thu, 3 Aug 2017 16:55:03 +0000 (16:55 +0000)]
Merge "Turn on bluetooth anomaly detector" into oc-dr1-dev
Ajay Nadathur [Thu, 3 Aug 2017 16:51:06 +0000 (16:51 +0000)]
Merge "Fingerprint added graphic is bigger than enrolling progressbar" into oc-mr1-dev
am:
1908c4010b
Change-Id: I949aa81a0a88be0824590d85a50400b1b1268d3f
Ajay Nadathur [Thu, 3 Aug 2017 16:45:10 +0000 (16:45 +0000)]
Merge "Fingerprint added graphic is bigger than enrolling progressbar" into oc-mr1-dev
Kenny Guy [Thu, 3 Aug 2017 14:26:24 +0000 (14:26 +0000)]
Update work briefcase asset. am:
27ea052133
am:
413d71d400
Change-Id: Ie98fd7842491f213cce743a80caff8534331f0fb
Kenny Guy [Thu, 3 Aug 2017 14:20:53 +0000 (14:20 +0000)]
Update work briefcase asset.
am:
27ea052133
Change-Id: I1ddee0d3c4da6b41b51a38aa1bad9ce3b1c14840
Kenny Guy [Tue, 20 Jun 2017 15:43:19 +0000 (16:43 +0100)]
Update work briefcase asset.
Bug:
36497538
Test: manual
Change-Id: If8c7385f75c1ff5b9fc257991e1c3255a70c8f8b
(cherry picked from commit
bb504346c779eee7fc3cf6650472a16dacc66b34)
TreeHugger Robot [Thu, 3 Aug 2017 04:59:45 +0000 (04:59 +0000)]
Merge "[Companion] Make notification dialog non-cancelable"
Eugene Susla [Wed, 2 Aug 2017 22:05:03 +0000 (15:05 -0700)]
[Companion] Make notification dialog non-cancelable
Bug:
63405718
Test: Ensute that the notification access dialog is not dismissable with
either back button or touch outside
Change-Id: I613da247a2adc0571478f649a2191cd5840359f0
Amit Mahajan [Thu, 3 Aug 2017 02:13:42 +0000 (02:13 +0000)]
Merge "Change to not cache user entered apn type as user may change it." into oc-dr1-dev am:
d1c3bb1341 am:
3d8d9808dd
am:
896037a1dc
Change-Id: I67ad1313de9b76b839995dc1bdf8f31ed4270873
Amit Mahajan [Thu, 3 Aug 2017 02:13:20 +0000 (02:13 +0000)]
Merge "Change to not cache user entered apn type as user may change it." into oc-dr1-dev am:
d1c3bb1341 am:
0af5de0639
am:
fdb5c991c1
Change-Id: I89c002a1edcfe054914e13c264d071ed766f5f61
Amit Mahajan [Thu, 3 Aug 2017 02:03:18 +0000 (02:03 +0000)]
Merge "Change to not cache user entered apn type as user may change it." into oc-dr1-dev am:
d1c3bb1341
am:
3d8d9808dd
Change-Id: I50dd513140c05aeee04552f009ea010b84f8dade
Amit Mahajan [Thu, 3 Aug 2017 02:02:37 +0000 (02:02 +0000)]
Merge "Change to not cache user entered apn type as user may change it." into oc-dr1-dev am:
d1c3bb1341
am:
0af5de0639
Change-Id: I70d05c9f4ae755dd9958aac60a9ca6ac8592ca07
Amit Mahajan [Thu, 3 Aug 2017 01:57:38 +0000 (01:57 +0000)]
Merge "Change to not cache user entered apn type as user may change it." into oc-dr1-dev
am:
d1c3bb1341
Change-Id: I693e64b11f9f4320d57749e35143d201fa3d23ca
Amit Mahajan [Thu, 3 Aug 2017 01:57:38 +0000 (01:57 +0000)]
Merge "Change to not cache user entered apn type as user may change it." into oc-dr1-dev
am:
d1c3bb1341
Change-Id: If5018f14c636f6634e70771471ee6ee2103a0ede
TreeHugger Robot [Thu, 3 Aug 2017 01:46:21 +0000 (01:46 +0000)]
Merge "Change to not cache user entered apn type as user may change it." into oc-dr1-dev
TreeHugger Robot [Wed, 2 Aug 2017 23:29:13 +0000 (23:29 +0000)]
Merge "Convert app storage page to use generic ActionButtonPref"
Bill Yi [Wed, 2 Aug 2017 22:21:53 +0000 (22:21 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
a3bdce963f -s ours am:
52498c1da9 -s ours
am:
97d8360fc5 -s ours
Change-Id: Id3cabaf31bf2ff3954de71071380c4b6c23a8374
Doris Ling [Wed, 2 Aug 2017 22:21:50 +0000 (15:21 -0700)]
Make account preference icons bigger.
Use the regular preference layout for AccountTypePreference so that the
icon size will be the standard size.
Change-Id: I58a9e2d02b94f5abd9c8bb546f3d4e2984b3d6c6
Fix:
63660734
Test: visual
Bill Yi [Wed, 2 Aug 2017 22:17:07 +0000 (22:17 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
a3bdce963f -s ours am:
f366a8716a -s ours
am:
290200b2a7 -s ours
Change-Id: I0bb067d9265fc9dca5d682b1f6ad2df204c38464
Bill Yi [Wed, 2 Aug 2017 22:16:53 +0000 (22:16 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
a3bdce963f -s ours
am:
52498c1da9 -s ours
Change-Id: Ibbca1b09b50102ece59623530bfe131610449c8d
Bill Yi [Wed, 2 Aug 2017 22:12:38 +0000 (22:12 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
a3bdce963f -s ours
Change-Id: Ia5800ef75e332195d281d0b9f687bffb6ddcb16c
Bill Yi [Wed, 2 Aug 2017 22:11:51 +0000 (22:11 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
a3bdce963f -s ours
am:
f366a8716a -s ours
Change-Id: I555e47f15108be17b89d75de17f932fb5fd32528
Bill Yi [Wed, 2 Aug 2017 22:07:22 +0000 (22:07 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
a3bdce963f -s ours
Change-Id: I832d9850508a376fc4dccc53df3a943379ada6cf
TreeHugger Robot [Wed, 2 Aug 2017 21:57:36 +0000 (21:57 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Fan Zhang [Wed, 2 Aug 2017 21:39:56 +0000 (21:39 +0000)]
Merge "Support dynamic summary and icon for injected tiles"
Fan Zhang [Wed, 2 Aug 2017 21:15:24 +0000 (21:15 +0000)]
Style action bar during onResume instead of onCreate am:
e156d9a59f am:
97e850ade9 -s ours
am:
50790d76fa -s ours
Change-Id: Ib37dc2697c4bbef0e50191b2341732641b81ce38
Fan Zhang [Wed, 2 Aug 2017 21:10:23 +0000 (21:10 +0000)]
Style action bar during onResume instead of onCreate am:
e156d9a59f
am:
97e850ade9 -s ours
Change-Id: I6de39f0014a666c6367d032527d04018ba681566
Fan Zhang [Wed, 2 Aug 2017 21:05:23 +0000 (21:05 +0000)]
Style action bar during onResume instead of onCreate am:
e156d9a59f -s ours am:
cb9f8a8ebc
am:
85a0a5771e
Change-Id: If70a8489c5fcb26f5064e18e26c71d73ffb3209c
Fan Zhang [Wed, 2 Aug 2017 21:04:49 +0000 (21:04 +0000)]
Style action bar during onResume instead of onCreate am:
50eb81f114
am:
a31da35b74
Change-Id: Id11f7a3ba5957d109004a83c078c9f7c4f5461b1
Fan Zhang [Wed, 2 Aug 2017 21:01:43 +0000 (21:01 +0000)]
Style action bar during onResume instead of onCreate am:
e156d9a59f -s ours
am:
cb9f8a8ebc
Change-Id: If7eb4529c55a5e739850dc775d27b052ba357b96
Fan Zhang [Wed, 2 Aug 2017 21:01:16 +0000 (21:01 +0000)]
Style action bar during onResume instead of onCreate
am:
50eb81f114
Change-Id: I4259ccfcb36b193a2fa4c745338860c407eeedd6
Fan Zhang [Wed, 2 Aug 2017 20:59:50 +0000 (20:59 +0000)]
Style action bar during onResume instead of onCreate
am:
e156d9a59f -s ours
Change-Id: I4b6c8332a9a950fc9b5ca2310a4099e7cf887202
Fan Zhang [Wed, 2 Aug 2017 20:50:24 +0000 (20:50 +0000)]
Style action bar during onResume instead of onCreate
am:
e156d9a59f
Change-Id: Iee729bda63cb9cf007754d1003fa02d755d5a771
Ajay Nadathur [Thu, 20 Jul 2017 02:09:33 +0000 (19:09 -0700)]
Fingerprint added graphic is bigger than enrolling progressbar
bug:
63714762
Test: Manually tested
Change-Id: I415ab41bb985eb52146693091d61152b51ecfd6c
Saige McVea [Wed, 2 Aug 2017 19:54:02 +0000 (19:54 +0000)]
Merge "Update generic icon in accessibility settings to a lighter colour."
Bill Yi [Wed, 2 Aug 2017 19:47:11 +0000 (12:47 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie91a9117688052ec898ebf955a9c6978e1304af6
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Rajeev Kumar [Wed, 2 Aug 2017 19:26:09 +0000 (19:26 +0000)]
Merge "Replace with HashMap with ArrayMap."
TreeHugger Robot [Wed, 2 Aug 2017 18:58:51 +0000 (18:58 +0000)]
Merge "Delete unused classes"
Fan Zhang [Wed, 2 Aug 2017 17:47:37 +0000 (10:47 -0700)]
Style action bar during onResume instead of onCreate
Change-Id: I628266e7062e514d2044c9e32668db23094d82e6
Merged-In: Ib57bf128b644737b5a34238ec85ca6d740543c5f
Fix:
64284689
Bug:
64297479
Test: robotests
jackqdyulei [Tue, 1 Aug 2017 17:45:41 +0000 (10:45 -0700)]
Turn on bluetooth anomaly detector
Since the related bug in battery stats is fixed, it is safe to
turn it on.
Also fix a bug in LocationCheckAction. In PermissionChecker we should
use permission name to check, not permission group name.
Bug:
64255601
Test: RunSettingsRoboTests
Change-Id: Ief8b5dc98f8a7ae462eb84936f6f61d626d7cddd
Fan Zhang [Wed, 2 Aug 2017 17:47:37 +0000 (10:47 -0700)]
Style action bar during onResume instead of onCreate
Change-Id: Ib57bf128b644737b5a34238ec85ca6d740543c5f
Fix:
64284689
Bug:
64297479
Test: robotests
TreeHugger Robot [Wed, 2 Aug 2017 17:23:58 +0000 (17:23 +0000)]
Merge "Ensure a11y ids for LabeledSeekBar are in bounds"
Amit Mahajan [Wed, 2 Aug 2017 16:59:03 +0000 (09:59 -0700)]
Change to not cache user entered apn type as user may change it.
Test: manual
Bug:
64263412
Change-Id: Idc49109926e123eddec7f6553f3c493b1ed22212
Phil Weaver [Fri, 28 Jul 2017 18:05:40 +0000 (11:05 -0700)]
Ensure a11y ids for LabeledSeekBar are in bounds
Bug:
64124736
Test: I just played with it with TalkBack on. The crash
was difficult to reproduce before, and I can't make it
fail now. I believe I got it.
Change-Id: I17ffe8d83e21e716d1c0cadea52afcf09bff6e97
Bill Yi [Wed, 2 Aug 2017 15:21:24 +0000 (15:21 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am:
446c5b08b1 -s ours
am:
08db3835ee -s ours
Change-Id: I05427f556c6d0a76422bdc7c33b114fd197b3bc1
Bill Yi [Wed, 2 Aug 2017 15:13:23 +0000 (15:13 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
446c5b08b1 -s ours
Change-Id: I7c6d93380f9195ee177646871ed80e8cfa136b12
Bill Yi [Wed, 2 Aug 2017 14:57:50 +0000 (14:57 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Wed, 2 Aug 2017 14:13:08 +0000 (14:13 +0000)]
Merge "Import translations. DO NOT MERGE"
Andrew Sapperstein [Wed, 2 Aug 2017 06:27:35 +0000 (06:27 +0000)]
Merge "Refactoring DoubleTwistPreferenceController." into oc-dr1-dev am:
3daceaec5f am:
0f13525842
am:
71e40d24a1
Change-Id: I2360a3f35e5f24e0ff8f6fc1e80bac5caf43096c
Andrew Sapperstein [Wed, 2 Aug 2017 06:15:55 +0000 (06:15 +0000)]
Merge "Refactoring DoubleTwistPreferenceController." into oc-dr1-dev am:
3daceaec5f
am:
0f13525842
Change-Id: I0db5879b01cb1a03b99911472625a6090a412b26
Andrew Sapperstein [Wed, 2 Aug 2017 06:15:52 +0000 (06:15 +0000)]
Merge "Refactoring DoubleTwistPreferenceController." into oc-dr1-dev am:
3daceaec5f am:
aa661b548b
am:
d126c63e22
Change-Id: Ie5f388882f295bc6af68fa947540678a2bbaa30d
Andrew Sapperstein [Wed, 2 Aug 2017 06:11:53 +0000 (06:11 +0000)]
Merge "Refactoring DoubleTwistPreferenceController." into oc-dr1-dev am:
3daceaec5f
am:
aa661b548b
Change-Id: Ieb0569d46a5f06aa6fd372b685d8f64152d68029
Andrew Sapperstein [Wed, 2 Aug 2017 06:07:23 +0000 (06:07 +0000)]
Merge "Refactoring DoubleTwistPreferenceController." into oc-dr1-dev
am:
3daceaec5f
Change-Id: Ie4d946fb7ca1c018f8e1e5f3b54462f0e59041fa
Andrew Sapperstein [Wed, 2 Aug 2017 06:07:23 +0000 (06:07 +0000)]
Merge "Refactoring DoubleTwistPreferenceController." into oc-dr1-dev
am:
3daceaec5f
Change-Id: Iabce075585a4cca4c0876999f6b9e9f031fe2c10
TreeHugger Robot [Wed, 2 Aug 2017 06:02:29 +0000 (06:02 +0000)]
Merge "Refactoring DoubleTwistPreferenceController." into oc-dr1-dev
Bill Yi [Wed, 2 Aug 2017 01:01:46 +0000 (18:01 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iee79f4aad0c81901bc3c79b8dac1c95c29db3f00
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Fan Zhang [Wed, 2 Aug 2017 00:41:18 +0000 (17:41 -0700)]
Delete unused classes
Change-Id: I014136b02ffc7f4d10ac450c9583b883c84d22a1
Fix:
32700131
Test: rerun robotest
Bill Yi [Wed, 2 Aug 2017 00:50:15 +0000 (17:50 -0700)]
Import translations. DO NOT MERGE
Change-Id: I70665a48ae94d3113c3fdeb70c14ae9f2dc7ea20
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Saige McVea [Tue, 1 Aug 2017 22:31:09 +0000 (15:31 -0700)]
Update generic icon in accessibility settings to a lighter colour.
The previous icon was dark grey with a shadow. The new icon is a
lighter grey with no shadow.
Test: manual
Bug:
63338590
Change-Id: I872a6cf4af37a9b35c79b8ca30b171d76115343c
Daniel Nishi [Tue, 1 Aug 2017 23:44:53 +0000 (23:44 +0000)]
Merge "Make nfc toggability logic static and public." into oc-dr1-dev am:
b27d65fa55 am:
ea39f74a42
am:
a7f215cce2
Change-Id: Ic62d4858cc3ae4643dc020cc9c9846df3e88d2c4
Daniel Nishi [Tue, 1 Aug 2017 23:44:16 +0000 (23:44 +0000)]
Merge "Make nfc toggability logic static and public." into oc-dr1-dev am:
b27d65fa55 am:
db1158f855
am:
85cd1b7d39
Change-Id: I6721eddb38547d8b7c2bc7513b1ea40c81a89cc8
TreeHugger Robot [Tue, 1 Aug 2017 23:40:59 +0000 (23:40 +0000)]
Merge "Convert more pages to use ActionButtonPreference"
Daniel Nishi [Tue, 1 Aug 2017 23:31:46 +0000 (23:31 +0000)]
Merge "Make nfc toggability logic static and public." into oc-dr1-dev am:
b27d65fa55
am:
ea39f74a42
Change-Id: I04d39ec692c704d24f515aec1cc12961918db2ce
Daniel Nishi [Tue, 1 Aug 2017 23:27:41 +0000 (23:27 +0000)]
Merge "Make nfc toggability logic static and public." into oc-dr1-dev am:
b27d65fa55
am:
db1158f855
Change-Id: I39a83eff9705f8ed5e66a4ea4aeada9f262d12aa
Fan Zhang [Wed, 26 Jul 2017 17:58:32 +0000 (10:58 -0700)]
Support dynamic summary and icon for injected tiles
Bug:
63758074
Test: robotests
Change-Id: I2fa27812800c12606a613896ea2aa69dda393944
Daniel Nishi [Tue, 1 Aug 2017 23:18:58 +0000 (23:18 +0000)]
Merge "Make nfc toggability logic static and public." into oc-dr1-dev
am:
b27d65fa55
Change-Id: Id09171357fb772cc05ec668eafa10e5320cefeb5
Daniel Nishi [Tue, 1 Aug 2017 23:18:57 +0000 (23:18 +0000)]
Merge "Make nfc toggability logic static and public." into oc-dr1-dev
am:
b27d65fa55
Change-Id: Ie3f854c21d7a099095202a9005cea6a8aec670c2
Daniel Nishi [Tue, 1 Aug 2017 23:11:18 +0000 (23:11 +0000)]
Merge "Make nfc toggability logic static and public." into oc-dr1-dev
Fan Zhang [Tue, 1 Aug 2017 21:06:14 +0000 (14:06 -0700)]
Convert app storage page to use generic ActionButtonPref
Change-Id: I2154bbbc5c78fe313b22f1d66229d6da7586279f
Fix:
63991885
Test: robotests
TreeHugger Robot [Tue, 1 Aug 2017 22:11:15 +0000 (22:11 +0000)]
Merge "Import translations. DO NOT MERGE"
Bill Yi [Tue, 1 Aug 2017 21:39:48 +0000 (21:39 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am:
4f368a3acc -s ours
am:
7f5b5f391d -s ours
Change-Id: I1527ea5d213143405fa5f293bb44f8d6485fbd72
Fan Zhang [Sat, 29 Jul 2017 00:18:44 +0000 (17:18 -0700)]
Convert more pages to use ActionButtonPreference
- text to speech page
- blue tooth detail page
- installed app page
Change-Id: Ib743a144cc6025055cd496ec077f13fce4db0c69
Bug:
63991885
Test: robotests
Meng Wang [Tue, 1 Aug 2017 21:20:52 +0000 (21:20 +0000)]
Merge "Rephrase emergency_address_summary to remove '911'" into oc-mr1-dev am:
1ae2573bb5
am:
7a801228f6
Change-Id: I16426bc3253e3852976890ffb62e33c6e4e5ed65
Bill Yi [Tue, 1 Aug 2017 21:20:26 +0000 (21:20 +0000)]
Import translations. DO NOT MERGE am:
b9fa3d1115 -s ours am:
6444b2ac85 -s ours
am:
090a10ab35 -s ours
Change-Id: I823f83b4affcb0ddb7493d90d9ac65b1dc80a7a9
Bill Yi [Tue, 1 Aug 2017 21:20:04 +0000 (21:20 +0000)]
Import translations. DO NOT MERGE am:
b9fa3d1115 -s ours am:
1b16f952e7 -s ours
am:
bfeafd271c -s ours
Change-Id: I0d2ba6ce2109ff293330dcd3bdae66d8a72b93fe
Bill Yi [Tue, 1 Aug 2017 21:19:19 +0000 (21:19 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
4f368a3acc -s ours
Change-Id: I6d826f234c28123e0636c58e049454b618d1b1a9
TreeHugger Robot [Tue, 1 Aug 2017 21:00:25 +0000 (21:00 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Andrew Sapperstein [Sat, 29 Jul 2017 00:51:17 +0000 (17:51 -0700)]
Refactoring DoubleTwistPreferenceController.
Made the availability and setting logic static so that
it can be invoked without creating a controller.
Bug:
62022517
Test: robotests
Change-Id: I3a51c61849e6ba8b8aa850ca22d666a9f84d252f
Meng Wang [Tue, 1 Aug 2017 20:55:13 +0000 (20:55 +0000)]
Merge "Rephrase emergency_address_summary to remove '911'" into oc-mr1-dev
am:
1ae2573bb5
Change-Id: I622a7851b1cff523633d62727f437651627883d3
Bill Yi [Tue, 1 Aug 2017 20:54:24 +0000 (20:54 +0000)]
Import translations. DO NOT MERGE am:
b9fa3d1115 -s ours
am:
6444b2ac85 -s ours
Change-Id: I83535cf31351afc73228cfe7e26be0437d847cb2
Bill Yi [Tue, 1 Aug 2017 20:39:43 +0000 (20:39 +0000)]
Import translations. DO NOT MERGE am:
b9fa3d1115 -s ours
am:
1b16f952e7 -s ours
Change-Id: I976b5b1fd4e0e23a91929b5828c9a1e7599b9f52
Meng Wang [Tue, 1 Aug 2017 20:37:37 +0000 (20:37 +0000)]
Merge "Rephrase emergency_address_summary to remove '911'" into oc-mr1-dev
Bill Yi [Tue, 1 Aug 2017 20:35:43 +0000 (20:35 +0000)]
Import translations. DO NOT MERGE
am:
b9fa3d1115 -s ours
Change-Id: I209e686f6bb1047fdc89e8d0103bb5ad7391f33f
Bill Yi [Tue, 1 Aug 2017 20:35:41 +0000 (20:35 +0000)]
Import translations. DO NOT MERGE
am:
b9fa3d1115 -s ours
Change-Id: I5efc1ca9ac51a4840d12fe21ba4db578dd00927e
Salvador Martinez [Tue, 1 Aug 2017 20:15:41 +0000 (20:15 +0000)]
Merge "Shorten main settings battery string" into oc-mr1-dev am:
4e963f8f91
am:
6db99201aa
Change-Id: I82bf5cfe72cfd8ec774c6c7d21c17bd946163903
Salvador Martinez [Tue, 1 Aug 2017 20:01:13 +0000 (20:01 +0000)]
Merge "Shorten main settings battery string" into oc-mr1-dev
am:
4e963f8f91
Change-Id: I00e0b8126679815d460336d1cc2b01fc5abf55bd
Fan Zhang [Tue, 1 Aug 2017 19:46:36 +0000 (19:46 +0000)]
Merge "Disable AssistGestureSetting search if not supported" into oc-mr1-dev am:
7fbfda67da
am:
bbd92b5748
Change-Id: I15a40bcae625d5bacb0217c0a5f8ea16862e2fc4
OSDN Git Service
