Commit Graph

39153 Commits

Author SHA1 Message Date
Bill Yi
eb84d31f62 Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 446c5b08b1 -s ours
am: 08db3835ee  -s ours

Change-Id: I05427f556c6d0a76422bdc7c33b114fd197b3bc1
2017-08-02 15:21:24 +00:00
Bill Yi
08db3835ee Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: 446c5b08b1  -s ours

Change-Id: I7c6d93380f9195ee177646871ed80e8cfa136b12
2017-08-02 15:13:23 +00:00
Bill Yi
446c5b08b1 Merge "Import translations. DO NOT MERGE" into oc-mr1-dev 2017-08-02 14:57:50 +00:00
TreeHugger Robot
5525b75fff Merge "Import translations. DO NOT MERGE" 2017-08-02 14:13:08 +00:00
Andrew Sapperstein
67cb62fff5 Merge "Refactoring DoubleTwistPreferenceController." into oc-dr1-dev am: 3daceaec5f am: 0f13525842
am: 71e40d24a1

Change-Id: I2360a3f35e5f24e0ff8f6fc1e80bac5caf43096c
2017-08-02 06:27:35 +00:00
Andrew Sapperstein
71e40d24a1 Merge "Refactoring DoubleTwistPreferenceController." into oc-dr1-dev am: 3daceaec5f
am: 0f13525842

Change-Id: I0db5879b01cb1a03b99911472625a6090a412b26
2017-08-02 06:15:55 +00:00
Andrew Sapperstein
6549984cf2 Merge "Refactoring DoubleTwistPreferenceController." into oc-dr1-dev am: 3daceaec5f am: aa661b548b
am: d126c63e22

Change-Id: Ie5f388882f295bc6af68fa947540678a2bbaa30d
2017-08-02 06:15:52 +00:00
Andrew Sapperstein
d126c63e22 Merge "Refactoring DoubleTwistPreferenceController." into oc-dr1-dev am: 3daceaec5f
am: aa661b548b

Change-Id: Ieb0569d46a5f06aa6fd372b685d8f64152d68029
2017-08-02 06:11:53 +00:00
Andrew Sapperstein
0f13525842 Merge "Refactoring DoubleTwistPreferenceController." into oc-dr1-dev
am: 3daceaec5f

Change-Id: Iabce075585a4cca4c0876999f6b9e9f031fe2c10
2017-08-02 06:07:23 +00:00
Andrew Sapperstein
aa661b548b Merge "Refactoring DoubleTwistPreferenceController." into oc-dr1-dev
am: 3daceaec5f

Change-Id: Ie4d946fb7ca1c018f8e1e5f3b54462f0e59041fa
2017-08-02 06:07:23 +00:00
TreeHugger Robot
3daceaec5f Merge "Refactoring DoubleTwistPreferenceController." into oc-dr1-dev 2017-08-02 06:02:29 +00:00
Bill Yi
34d85d4cef Import translations. DO NOT MERGE
Change-Id: Iee79f4aad0c81901bc3c79b8dac1c95c29db3f00
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-08-01 18:01:46 -07:00
Bill Yi
e19376965e Import translations. DO NOT MERGE
Change-Id: I70665a48ae94d3113c3fdeb70c14ae9f2dc7ea20
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-08-01 17:50:15 -07:00
Daniel Nishi
964ee1b717 Merge "Make nfc toggability logic static and public." into oc-dr1-dev am: b27d65fa55 am: ea39f74a42
am: a7f215cce2

Change-Id: Ic62d4858cc3ae4643dc020cc9c9846df3e88d2c4
2017-08-01 23:44:53 +00:00
Daniel Nishi
93d95b515b Merge "Make nfc toggability logic static and public." into oc-dr1-dev am: b27d65fa55 am: db1158f855
am: 85cd1b7d39

Change-Id: I6721eddb38547d8b7c2bc7513b1ea40c81a89cc8
2017-08-01 23:44:16 +00:00
TreeHugger Robot
c7e7f28e88 Merge "Convert more pages to use ActionButtonPreference" 2017-08-01 23:40:59 +00:00
Daniel Nishi
a7f215cce2 Merge "Make nfc toggability logic static and public." into oc-dr1-dev am: b27d65fa55
am: ea39f74a42

Change-Id: I04d39ec692c704d24f515aec1cc12961918db2ce
2017-08-01 23:31:46 +00:00
Daniel Nishi
85cd1b7d39 Merge "Make nfc toggability logic static and public." into oc-dr1-dev am: b27d65fa55
am: db1158f855

Change-Id: I39a83eff9705f8ed5e66a4ea4aeada9f262d12aa
2017-08-01 23:27:41 +00:00
Daniel Nishi
ea39f74a42 Merge "Make nfc toggability logic static and public." into oc-dr1-dev
am: b27d65fa55

Change-Id: Id09171357fb772cc05ec668eafa10e5320cefeb5
2017-08-01 23:18:58 +00:00
Daniel Nishi
db1158f855 Merge "Make nfc toggability logic static and public." into oc-dr1-dev
am: b27d65fa55

Change-Id: Ie3f854c21d7a099095202a9005cea6a8aec670c2
2017-08-01 23:18:57 +00:00
Daniel Nishi
b27d65fa55 Merge "Make nfc toggability logic static and public." into oc-dr1-dev 2017-08-01 23:11:18 +00:00
TreeHugger Robot
11879690cd Merge "Import translations. DO NOT MERGE" 2017-08-01 22:11:15 +00:00
Bill Yi
a061b814ec Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 4f368a3acc -s ours
am: 7f5b5f391d  -s ours

Change-Id: I1527ea5d213143405fa5f293bb44f8d6485fbd72
2017-08-01 21:39:48 +00:00
Fan Zhang
1105a1a465 Convert more pages to use ActionButtonPreference
- text to speech page
- blue tooth detail page
- installed app page

Change-Id: Ib743a144cc6025055cd496ec077f13fce4db0c69
Bug: 63991885
Test: robotests
2017-08-01 14:27:42 -07:00
Meng Wang
1343c78445 Merge "Rephrase emergency_address_summary to remove '911'" into oc-mr1-dev am: 1ae2573bb5
am: 7a801228f6

Change-Id: I16426bc3253e3852976890ffb62e33c6e4e5ed65
2017-08-01 21:20:52 +00:00
Bill Yi
97011ed5a8 Import translations. DO NOT MERGE am: b9fa3d1115 -s ours am: 6444b2ac85 -s ours
am: 090a10ab35  -s ours

Change-Id: I823f83b4affcb0ddb7493d90d9ac65b1dc80a7a9
2017-08-01 21:20:26 +00:00
Bill Yi
4640be3275 Import translations. DO NOT MERGE am: b9fa3d1115 -s ours am: 1b16f952e7 -s ours
am: bfeafd271c  -s ours

Change-Id: I0d2ba6ce2109ff293330dcd3bdae66d8a72b93fe
2017-08-01 21:20:04 +00:00
Bill Yi
7f5b5f391d Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: 4f368a3acc  -s ours

Change-Id: I6d826f234c28123e0636c58e049454b618d1b1a9
2017-08-01 21:19:19 +00:00
TreeHugger Robot
4f368a3acc Merge "Import translations. DO NOT MERGE" into oc-mr1-dev 2017-08-01 21:00:25 +00:00
Andrew Sapperstein
9c9549bd29 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
2017-08-01 13:56:51 -07:00
Meng Wang
7a801228f6 Merge "Rephrase emergency_address_summary to remove '911'" into oc-mr1-dev
am: 1ae2573bb5

Change-Id: I622a7851b1cff523633d62727f437651627883d3
2017-08-01 20:55:13 +00:00
Bill Yi
090a10ab35 Import translations. DO NOT MERGE am: b9fa3d1115 -s ours
am: 6444b2ac85  -s ours

Change-Id: I83535cf31351afc73228cfe7e26be0437d847cb2
2017-08-01 20:54:24 +00:00
Bill Yi
bfeafd271c Import translations. DO NOT MERGE am: b9fa3d1115 -s ours
am: 1b16f952e7  -s ours

Change-Id: I976b5b1fd4e0e23a91929b5828c9a1e7599b9f52
2017-08-01 20:39:43 +00:00
Meng Wang
1ae2573bb5 Merge "Rephrase emergency_address_summary to remove '911'" into oc-mr1-dev 2017-08-01 20:37:37 +00:00
Bill Yi
1b16f952e7 Import translations. DO NOT MERGE
am: b9fa3d1115  -s ours

Change-Id: I209e686f6bb1047fdc89e8d0103bb5ad7391f33f
2017-08-01 20:35:43 +00:00
Bill Yi
6444b2ac85 Import translations. DO NOT MERGE
am: b9fa3d1115  -s ours

Change-Id: I5efc1ca9ac51a4840d12fe21ba4db578dd00927e
2017-08-01 20:35:41 +00:00
Salvador Martinez
fec50f4248 Merge "Shorten main settings battery string" into oc-mr1-dev am: 4e963f8f91
am: 6db99201aa

Change-Id: I82bf5cfe72cfd8ec774c6c7d21c17bd946163903
2017-08-01 20:15:41 +00:00
Salvador Martinez
6db99201aa Merge "Shorten main settings battery string" into oc-mr1-dev
am: 4e963f8f91

Change-Id: I00e0b8126679815d460336d1cc2b01fc5abf55bd
2017-08-01 20:01:13 +00:00
Fan Zhang
16e0ef2b7d Merge "Disable AssistGestureSetting search if not supported" into oc-mr1-dev am: 7fbfda67da
am: bbd92b5748

Change-Id: I15a40bcae625d5bacb0217c0a5f8ea16862e2fc4
2017-08-01 19:46:36 +00:00
TreeHugger Robot
4e963f8f91 Merge "Shorten main settings battery string" into oc-mr1-dev 2017-08-01 19:45:59 +00:00
Fan Zhang
bbd92b5748 Merge "Disable AssistGestureSetting search if not supported" into oc-mr1-dev
am: 7fbfda67da

Change-Id: Idac94b7754631c7bb0c0f91e8aa17b9d300b6c30
2017-08-01 19:24:23 +00:00
TreeHugger Robot
7fbfda67da Merge "Disable AssistGestureSetting search if not supported" into oc-mr1-dev 2017-08-01 19:09:31 +00:00
Bill Yi
0c15c622ad Import translations. DO NOT MERGE
Change-Id: Ie52cecfa47dc7d0a982d8f36a12b1b024bfbfd0d
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-08-01 11:32:34 -07:00
Bill Yi
0607783046 Import translations. DO NOT MERGE
Change-Id: I2583b083c748943ce33715d13cf2f1c5cb9591dc
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-08-01 11:31:16 -07:00
Bill Yi
4421852e12 Merge "Import translations. DO NOT MERGE am: 2f525fbdc5 -s ours am: f8c9a63ca6 -s ours" into oc-mr1-dev-plus-aosp
am: 8c3d164113  -s ours

Change-Id: Ia0dd883921e32839e6ab23f176c7547a3abe2d07
2017-08-01 18:29:01 +00:00
Bill Yi
f0f41105ed Import translations. DO NOT MERGE am: 2f525fbdc5 -s ours am: 23e79be08d -s ours
am: 8c0d932862  -s ours

Change-Id: I210d176201ddc67e8c5e266283bfc24f2eb57bc8
2017-08-01 18:28:35 +00:00
Android Build Merger (Role)
8c3d164113 Merge "Import translations. DO NOT MERGE am: 2f525fbdc5 -s ours am: f8c9a63ca6 -s ours" into oc-mr1-dev-plus-aosp 2017-08-01 18:18:27 +00:00
Bill Yi
6f76c3b39f Import translations. DO NOT MERGE am: 2f525fbdc5 -s ours
am: f8c9a63ca6  -s ours

Change-Id: Ia4847676d5300b253b85a91c4f743ee105294065
2017-08-01 18:18:06 +00:00
Bill Yi
8c0d932862 Import translations. DO NOT MERGE am: 2f525fbdc5 -s ours
am: 23e79be08d  -s ours

Change-Id: I16e397981fcc9478506ee08737ae77f1269e20ec
2017-08-01 18:18:03 +00:00
Bill Yi
b9fa3d1115 Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64073208
Change-Id: Idb323f93239f5c66ae4fb53f37bff242d5839198
2017-08-01 11:15:13 -07:00