Bill Yi
261936eccf
Merge changes from topic "tc_change_21" into tm-dev
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 192bd4e1f0
Import translations. DO NOT MERGE ANYWHERE
2022-05-04 17:07:37 +00:00
Bill Yi
8c0d18ada4
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod
2022-05-04 17:07:37 +00:00
Bill Yi
9349330a1f
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod
2022-05-04 17:04:03 +00:00
TreeHugger Robot
38468ab17a
Merge "Hide Wi-Fi toggle in the Wi-Fi slice" into tm-dev am: 3fb9c1a24b
am: 5a138163b4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18157802
Change-Id: Ife8cf047608c12e7d89b101f7eadd80b99cc10dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 16:54:28 +00:00
Automerger Merge Worker
0a6ed415d0
Merge "Merge "Remove Wi-Fi toggle in settings search" into tm-dev am: 2e6d03d0f4
am: d5f1760bc2" into tm-d1-dev-plus-aosp
2022-05-04 16:53:54 +00:00
TreeHugger Robot
093f22058c
Merge "Remove Wi-Fi toggle in settings search" into tm-dev am: 2e6d03d0f4
am: d5f1760bc2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18149762
Change-Id: I548ff88e2c15005b9be8ef1cfe60400c53ec39fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 16:53:52 +00:00
TreeHugger Robot
9f25dfbe24
Merge "Hide Wi-Fi toggle in the Wi-Fi slice" into tm-dev am: 3fb9c1a24b
am: 4a79ecce7f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18157802
Change-Id: I394ab524cd11acf93961e557ea94ea83599b1eda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 16:53:50 +00:00
TreeHugger Robot
aa2edb9be4
Merge "Remove Wi-Fi toggle in settings search" into tm-dev am: 2e6d03d0f4
am: d61d5316a3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18149762
Change-Id: If1618fdc467bde0a76db51f7456af999acbdd476
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 16:53:34 +00:00
TreeHugger Robot
5a138163b4
Merge "Hide Wi-Fi toggle in the Wi-Fi slice" into tm-dev am: 3fb9c1a24b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18157802
Change-Id: I21294fc5b06c6eaaf512cdb84d5c83f318baa140
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 16:32:18 +00:00
TreeHugger Robot
d5f1760bc2
Merge "Remove Wi-Fi toggle in settings search" into tm-dev am: 2e6d03d0f4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18149762
Change-Id: I2b49fcfb402b1269c38c35f840d8d09e53dacb91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 16:30:58 +00:00
TreeHugger Robot
4a79ecce7f
Merge "Hide Wi-Fi toggle in the Wi-Fi slice" into tm-dev am: 3fb9c1a24b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18157802
Change-Id: Ic6dcbe5d513d4fa3a9ca3fb7e03add4eb978d145
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 16:29:50 +00:00
TreeHugger Robot
d61d5316a3
Merge "Remove Wi-Fi toggle in settings search" into tm-dev am: 2e6d03d0f4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18149762
Change-Id: I39353aff59e39b3fc6219f52a836e03920cb99cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 16:28:55 +00:00
TreeHugger Robot
3fb9c1a24b
Merge "Hide Wi-Fi toggle in the Wi-Fi slice" into tm-dev
2022-05-04 16:01:35 +00:00
TreeHugger Robot
2e6d03d0f4
Merge "Remove Wi-Fi toggle in settings search" into tm-dev
2022-05-04 15:51:34 +00:00
Ayush Sharma
322d401aa8
Move set work lock message from header to footer
...
Also update the string.
Bug: 206083998
Bug: 230625178
Test: NA
Change-Id: I3e442f6a43e01f3633255551aa42902bf24e4aa8
2022-05-04 14:29:43 +00:00
Yi-Ling Chuang
d9453bf8c6
Show previous query upon configuration change
...
Save the query string before configuration changed and set the previous
query string upon the re-create.
Fixes: 204158119
Test: robotest
Change-Id: I48b2a4b272873665a653d2ebc4c02bb99d4b0d0d
2022-05-04 22:22:26 +08:00
Automerger Merge Worker
2d38a00204
Merge "Merge "Fix a11y label for LE Audio Battery" into tm-dev am: 22cda47705
am: c2ff0c7b74" into tm-d1-dev-plus-aosp
2022-05-04 10:00:11 +00:00
Chaohui Wang
2a50339348
Merge "Fix a11y label for LE Audio Battery" into tm-dev am: 22cda47705
am: c2ff0c7b74
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18090791
Change-Id: I2fa3e4e6bebf2854b3ea0d2949d3f27ba5c45325
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 10:00:08 +00:00
Chaohui Wang
58b70b17f7
Merge "Fix a11y label for LE Audio Battery" into tm-dev am: 22cda47705
am: 5f99fad806
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18090791
Change-Id: I9a7101fdd4ce16c34d2ad04e36c0272f72c509a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 10:00:07 +00:00
Jason Hsu
7f93722a80
Merge "Save user's option when clicking 'Change setting' in triple-tap warning dialog" into tm-dev am: c53c5a906f
am: f754ec4926
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18090126
Change-Id: I8967abb73d40d7a374a01c0f46a16f54618644a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 09:59:28 +00:00
Jason Hsu
b5b53be007
Merge "Save user's option when clicking 'Change setting' in triple-tap warning dialog" into tm-dev am: c53c5a906f
am: 0465a872ae
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18090126
Change-Id: I42c3fd4eb8e1c8a321fd080fb6166ae4177ba3f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 09:59:19 +00:00
Edgar Wang
0d4e918d0a
Merge "Adjust profile category padding in factory reset page." into tm-dev am: 1098684b19
am: e1c20560d4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18090789
Change-Id: I78a3f62c7a6ae65e1988c7fef56c1f8b5a69594f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 09:58:52 +00:00
Edgar Wang
602c65616e
Merge "Adjust profile category padding in factory reset page." into tm-dev am: 1098684b19
am: 3661a62e80
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18090789
Change-Id: I364fdad22885d0f78a83a6beda513c1b77729cad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 09:57:50 +00:00
danielwbhuang
a5ef37752b
[Panlingual] Unit test for onLocaleSelected
...
Add unit test.
Bug: 224724840
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AppLocalePickerActivityTest
Change-Id: Iabbf84d58d5c325b15d960d63aeda0f7ca7af00b
2022-05-04 17:51:01 +08:00
Chaohui Wang
c2ff0c7b74
Merge "Fix a11y label for LE Audio Battery" into tm-dev am: 22cda47705
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18090791
Change-Id: I0c1cc0c3dce818db23d6de7dbb1b99445aebae72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 09:02:04 +00:00
Jason Hsu
f754ec4926
Merge "Save user's option when clicking 'Change setting' in triple-tap warning dialog" into tm-dev am: c53c5a906f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18090126
Change-Id: I6e4aed7dd26965353730339420a7b7fc5bdedbab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 09:00:56 +00:00
Chaohui Wang
5f99fad806
Merge "Fix a11y label for LE Audio Battery" into tm-dev am: 22cda47705
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18090791
Change-Id: I3f40513425cd4023139e93cad954caa93979011e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 09:00:07 +00:00
Jason Hsu
0465a872ae
Merge "Save user's option when clicking 'Change setting' in triple-tap warning dialog" into tm-dev am: c53c5a906f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18090126
Change-Id: I298b3a3bc9950bb1b86ad0425d2e7986f679e1b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 08:59:23 +00:00
Edgar Wang
e1c20560d4
Merge "Adjust profile category padding in factory reset page." into tm-dev am: 1098684b19
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18090789
Change-Id: I5e9822ac867c84f31928eb8c3835adc666ce6b16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 08:58:38 +00:00
Edgar Wang
3661a62e80
Merge "Adjust profile category padding in factory reset page." into tm-dev am: 1098684b19
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18090789
Change-Id: Ie3555d9cda90495129c8f916a0ed2380b043485c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 08:58:21 +00:00
Chaohui Wang
22cda47705
Merge "Fix a11y label for LE Audio Battery" into tm-dev
2022-05-04 08:28:00 +00:00
Jason Hsu
c53c5a906f
Merge "Save user's option when clicking 'Change setting' in triple-tap warning dialog" into tm-dev
2022-05-04 08:03:58 +00:00
Edgar Wang
1098684b19
Merge "Adjust profile category padding in factory reset page." into tm-dev
2022-05-04 07:39:53 +00:00
Automerger Merge Worker
d5f1a92b20
Merge "Merge "Fix first item not a11y focusable in SimListDialog" into tm-dev am: 122d28ea09
am: f22dfd7dc5" into tm-d1-dev-plus-aosp
2022-05-04 07:09:42 +00:00
Chaohui Wang
207de8e77e
Merge "Fix first item not a11y focusable in SimListDialog" into tm-dev am: 122d28ea09
am: f22dfd7dc5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18090785
Change-Id: I5d06cd52d4f52e5e3272ff279a3cec60e878e847
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 07:09:40 +00:00
Chaohui Wang
16fcd82ba9
Merge "Fix first item not a11y focusable in SimListDialog" into tm-dev am: 122d28ea09
am: e5c954ceb3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18090785
Change-Id: I39be83e8e499f22a7caad3587bf69c7ea67a01b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 07:09:38 +00:00
YK Hung
fd726e1fcb
Merge "Add a mechanism to configure whether the summary should be set or not" into tm-dev am: eb4acf8435
am: 475ea0e01e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158824
Change-Id: Id5bed5965fb10e3fc61ce3c1519e53c831c9ae03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 07:09:33 +00:00
YK Hung
b0d2eefa2a
Merge "Add a mechanism to configure whether the summary should be set or not" into tm-dev am: eb4acf8435
am: 082c193751
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158824
Change-Id: I1d83fd019e7cd6826d0a686ae04f4520c06c4865
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 07:08:56 +00:00
Chaohui Wang
e5c954ceb3
Merge "Fix first item not a11y focusable in SimListDialog" into tm-dev am: 122d28ea09
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18090785
Change-Id: I18cca83d0d7836df97668a14426588dfd9ce06a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 06:42:24 +00:00
YK Hung
082c193751
Merge "Add a mechanism to configure whether the summary should be set or not" into tm-dev am: eb4acf8435
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158824
Change-Id: Ia40a2a689b005e2362909cc293573d89a3f42639
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 06:42:17 +00:00
Chaohui Wang
f22dfd7dc5
Merge "Fix first item not a11y focusable in SimListDialog" into tm-dev am: 122d28ea09
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18090785
Change-Id: Ic8695350f0acf62ffa788cc7e29435099011b128
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 06:41:06 +00:00
YK Hung
475ea0e01e
Merge "Add a mechanism to configure whether the summary should be set or not" into tm-dev am: eb4acf8435
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158824
Change-Id: I5c0f83ed5365e8abe4a2404348dc0293674df822
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 06:40:57 +00:00
Chaohui Wang
122d28ea09
Merge "Fix first item not a11y focusable in SimListDialog" into tm-dev
2022-05-04 06:37:25 +00:00
YK Hung
eb4acf8435
Merge "Add a mechanism to configure whether the summary should be set or not" into tm-dev
2022-05-04 06:19:43 +00:00
Chaohui Wang
ca4920090f
Fix a11y label for LE Audio Battery
...
Before fix, "Left" & "Right" are in the same LinearLayout, not grouped
with battery info.
After fix, "Left" & "100% battery" are grouped together.
Bug: 229042138
Test: manual test when Talkback enabled
Change-Id: Ieb35ef992f62040f14ed878515d63f6edb2559f6
2022-05-04 14:17:26 +08:00
TreeHugger Robot
928e18a669
Merge "Fix can't select the [USB Tethering] item in [Developer Options]" into tm-dev am: 756ed72913
am: c158bb54eb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18087628
Change-Id: I9e12288335646d6b2a64ab60ebd5f13b713dbdec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 06:00:25 +00:00
TreeHugger Robot
c158bb54eb
Merge "Fix can't select the [USB Tethering] item in [Developer Options]" into tm-dev am: 756ed72913
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18087628
Change-Id: I1a2ddc08bb84dee2617aefcb96a6a16db335f106
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 05:17:17 +00:00
Automerger Merge Worker
74d860ddfb
Merge "Merge "Fix that ripple effect of level buttons for adjusting font/display size doesn't fit the shape." into tm-dev am: 3ba4d5876d
am: af3385fd0c" into tm-d1-dev-plus-aosp
2022-05-04 04:51:52 +00:00
PETER LIANG
00bf715c6d
Merge "Fix that ripple effect of level buttons for adjusting font/display size doesn't fit the shape." into tm-dev am: 3ba4d5876d
am: af3385fd0c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18090784
Change-Id: Ib5eef86c2ccf28ddcf48361692a24ce165c67e77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 04:51:49 +00:00
TreeHugger Robot
a949b54610
Merge "Fix can't select the [USB Tethering] item in [Developer Options]" into tm-dev am: 756ed72913
am: 680e9f0a0f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18087628
Change-Id: Ifddf447db14dcafdaed421728bc6fd12b4e0ceab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 04:51:46 +00:00