Raff Tsai
d7b5583e19
Fix robolectric test failure
...
Fixes: 136660042
Test: make RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.core.codeinspection.CodeInspectionTest"
Change-Id: I348f70d348b61676c04bc384e99c6e71c73eaa26
2019-07-04 01:56:11 +00:00
Bill Yi
34eba28f51
[automerger skipped] Import translations. DO NOT MERGE am: a0fb9000bb -s ours am: 479df9b529 -s ours
...
am: dbd5065d5b
2019-07-03 17:55:31 -07:00
Bill Yi
e06bee0fc3
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 246873db8e -s ours
...
am: 9dc4eb1470
2019-07-03 17:28:33 -07:00
Bill Yi
dbd5065d5b
[automerger skipped] Import translations. DO NOT MERGE am: a0fb9000bb -s ours
...
am: 479df9b529
2019-07-03 16:48:28 -07:00
Bill Yi
9dc4eb1470
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
...
am: 246873db8e
2019-07-03 16:42:04 -07:00
Kevin Chyn
ef8f844969
Merge "Send userId together with enroll / setFeature / getFeature method update" into qt-r1-dev am: 47593cd29b
...
am: d40d9887f9
2019-07-03 16:30:32 -07:00
Bill Yi
479df9b529
[automerger skipped] Import translations. DO NOT MERGE
...
am: a0fb9000bb
2019-07-03 16:19:58 -07:00
Kevin Chyn
d40d9887f9
Merge "Send userId together with enroll / setFeature / getFeature method update" into qt-r1-dev
...
am: 47593cd29b
2019-07-03 16:14:47 -07:00
Mill Chen
08c4c4aadd
Separate shortcut preference controller form accessibility
...
Bug: 135056871
Test: manual, robotests
Change-Id: I1dc61d50f46dfbd9bbd6fa33ecbc03157427d0b1
2019-07-03 20:15:09 +08:00
TreeHugger Robot
246873db8e
Merge "Import translations. DO NOT MERGE" into qt-r1-dev
2019-07-03 07:21:59 +00:00
Bill Yi
a0fb9000bb
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I6863ccbf2304c8bb2d7ee93b41386bff36e33a41
2019-07-02 23:30:20 -07:00
Bill Yi
0b2b3a0ded
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I9ea845510ab634d146f09f885ab0de8cd789c325
2019-07-02 19:46:11 -07:00
Kevin Chyn
47593cd29b
Merge "Send userId together with enroll / setFeature / getFeature method update" into qt-r1-dev
2019-07-03 02:07:49 +00:00
Neil Fuller
78a7facc02
Merge "Add tobiast@ to the OWNERS file" am: a931693721 am: 46e53e770c am: bf673318f1
...
am: e13cd91161
2019-07-02 17:36:47 -07:00
Neil Fuller
e13cd91161
Merge "Add tobiast@ to the OWNERS file" am: a931693721 am: 46e53e770c
...
am: bf673318f1
2019-07-02 16:26:40 -07:00
TreeHugger Robot
6bb07bf056
Merge "Add theme component options to settings keywords."
2019-07-02 22:51:25 +00:00
Neil Fuller
bf673318f1
Merge "Add tobiast@ to the OWNERS file" am: a931693721
...
am: 46e53e770c
2019-07-02 15:32:40 -07:00
Xin Li
6bc3378f3d
[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master am: 0a68e9bfe7 -s ours am: 59b1a2f6bb
...
am: c12cc62208
2019-07-02 12:50:16 -07:00
Xin Li
c12cc62208
[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master am: 0a68e9bfe7 -s ours
...
am: 59b1a2f6bb
2019-07-02 11:41:19 -07:00
Julia Reynolds
6b0315fbc1
Merge "Move channel listing into a pref controller"
2019-07-02 18:10:12 +00:00
Amin Shaikh
be8345e565
Add theme component options to settings keywords.
...
Fixes: 135521048
Test: mp settingsg; search for keywords
Change-Id: Ic2c2827fd5b6eff3b8cc11dc5201fc7c4d55778f
2019-07-02 13:33:46 -04:00
Neil Fuller
46e53e770c
Merge "Add tobiast@ to the OWNERS file"
...
am: a931693721
2019-07-02 10:13:36 -07:00
TreeHugger Robot
08e3b42a28
Merge "Separate daltonizer preference controller form accessibility"
2019-07-02 17:13:15 +00:00
Xin Li
59b1a2f6bb
[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master
...
am: 0a68e9bfe7
2019-07-02 10:04:54 -07:00
Julia Reynolds
a295d71c94
Move channel listing into a pref controller
...
And a hidden preference category. This makes
hiding/showing the list a lot cleaner and also allows more
of the code to be tested.
Also delete some unused code that no longer complied after
this refactor.
Fixes: 133443871
Test: atest
Change-Id: I4a5fe0e075019bae2df44a0a9dcec26a40ee6d12
2019-07-02 11:24:50 -04:00
Neil Fuller
a931693721
Merge "Add tobiast@ to the OWNERS file"
2019-07-02 14:27:55 +00:00
Neil Fuller
ca6542843c
Add tobiast@ to the OWNERS file
...
Add tobiast@ to the OWNERS file as libcore TL.
Remove pszczepaniak@ as he hasn't been on libcore
for a while.
Test: None
Change-Id: I714d3448ed60006cb58a0f49e95b7b834a6aac36
2019-07-02 10:55:50 +01:00
TreeHugger Robot
74e5e4fd26
Merge "Fix talkback issue about announcing wrong number of items"
2019-07-02 07:46:23 +00:00
Stanley Wang
29a15fb7be
Merge "Fix Settings search result 'add an account' does nothing."
2019-07-02 07:45:24 +00:00
Mill Chen
8d240c7f28
Separate daltonizer preference controller form accessibility
...
Bug: 135056871
Test: manual, robotests
Change-Id: Ibc730004f1a25a2e97abcc0bbad2dfc9b420d645
2019-07-02 15:08:17 +08:00
tmfang
b981068248
Fix talkback issue about announcing wrong number of items
...
From hierarchical view, one of root cause is PreferenceCategory.
Looks like PreferenceCategory generates an invisible space when
we add a footerPreference as a child.
So, we remove PreferenceCategory directly, and declard "allow divider"
attribute for neccessary preferences.
Test: Visual
Fixes: 130396913
Change-Id: I6d56ac165633aa211e794e07417821066380d041
2019-07-02 02:33:05 +00:00
Bill Yi
eae13f76f7
[automerger skipped] Import translations. DO NOT MERGE am: da20a84f9b -s ours
...
am: 7ed2100d0e
2019-07-01 16:35:50 -07:00
Bill Yi
7ed2100d0e
[automerger skipped] Import translations. DO NOT MERGE
...
am: da20a84f9b
2019-07-01 16:21:34 -07:00
Xin Li
0a68e9bfe7
DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master
...
Bug: 134405016
Change-Id: I298dd1232c7e304b5d2cd9fda59006d08026698a
2019-07-01 21:00:04 +00:00
Bill Yi
da20a84f9b
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I6ab947284694fa3922d185f58f57c5acfd83b2ee
2019-07-01 12:27:35 -07:00
Robert Snoeberger
b11c29c6a5
Merge "Remove "clocks" from string" into qt-r1-dev am: a4a25871d4
...
am: a350189b88
2019-07-01 10:45:38 -07:00
Robert Snoeberger
a350189b88
Merge "Remove "clocks" from string" into qt-r1-dev
...
am: a4a25871d4
2019-07-01 10:34:22 -07:00
Robert Snoeberger
a4a25871d4
Merge "Remove "clocks" from string" into qt-r1-dev
2019-07-01 17:19:27 +00:00
Robert Snoeberger
0e65d651d1
Remove "clocks" from string
...
Fixes: 136193731
Bug: 136090066
Test: manual
Change-Id: I63751bb31016754930a4773d791f118103026ada
2019-07-01 17:12:16 +00:00
Amin Shaikh
b62a45e156
Merge "Update ic_sync_problem to GM2." into qt-r1-dev am: 0217400ea5
...
am: fea6983c2b
2019-07-01 05:16:46 -07:00
Amin Shaikh
fea6983c2b
Merge "Update ic_sync_problem to GM2." into qt-r1-dev
...
am: 0217400ea5
2019-07-01 05:08:46 -07:00
TreeHugger Robot
0217400ea5
Merge "Update ic_sync_problem to GM2." into qt-r1-dev
2019-07-01 11:52:33 +00:00
TreeHugger Robot
422c953beb
Merge "Add synonym for "Display over other apps""
2019-07-01 11:52:24 +00:00
TreeHugger Robot
1c239faf11
Merge "Separate caption preference controller from accessibility"
2019-07-01 11:43:24 +00:00
Bill Yi
fb5c04bfe6
[automerger skipped] Import translations. DO NOT MERGE am: 26a2694bd3 -s ours am: ae58e057d7 -s ours
...
am: 1b807c64c4
2019-07-01 03:19:34 -07:00
Bill Yi
87a65e04ac
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 512b97f994 -s ours
...
am: ebe3b061ee
2019-07-01 03:18:48 -07:00
Bill Yi
259a7cc971
[automerger skipped] Import translations. DO NOT MERGE am: 26a2694bd3 -s ours am: d1bdb4f72d -s ours
...
am: def50c6ed1
2019-07-01 03:15:32 -07:00
Bill Yi
1b807c64c4
[automerger skipped] Import translations. DO NOT MERGE am: 26a2694bd3 -s ours
...
am: ae58e057d7
2019-07-01 03:00:39 -07:00
Bill Yi
ebe3b061ee
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
...
am: 512b97f994
2019-07-01 02:59:21 -07:00
Bill Yi
def50c6ed1
[automerger skipped] Import translations. DO NOT MERGE am: 26a2694bd3 -s ours
...
am: d1bdb4f72d
2019-07-01 02:58:20 -07:00
