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
9349330a1f
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod
2022-05-04 17:04:03 +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
Chaohui Wang
140cb75566
Display TOO_SHORT_WHEN_ALL_NUMERIC
...
To distinguish the requirement between all numeric
and not all numeric when COMPLEXITY_HIGH.
Fix: 227149118
Fix: 173167839
Test: manual & robolectric
Change-Id: I1f682625d8e86963218dda43b626a9e55d169fb3
2022-05-04 21:51:06 +08:00
Jack Yu
2290b0af8c
Do not let guest user disable secuer nfc via SettingsSlice
...
Do not let guest user switch the secure nfc preferernce setting.
Bug: 228314987
Test: manual
Change-Id: I60a832e32d83bb57d968af2f8b92d94e2ac7c6a2
2022-05-04 18:06:04 +08: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
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
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
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
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
TreeHugger Robot
756ed72913
Merge "Fix can't select the [USB Tethering] item in [Developer Options]" into tm-dev
2022-05-04 04:47:44 +00:00
PETER LIANG
af3385fd0c
Merge "Fix that ripple effect of level buttons for adjusting font/display size doesn't fit the shape." into tm-dev am: 3ba4d5876d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18090784
Change-Id: Ibcd1173ba5322d9ea9290e5ce232a62004d64ec5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 04:13:42 +00:00
PETER LIANG
3ba4d5876d
Merge "Fix that ripple effect of level buttons for adjusting font/display size doesn't fit the shape." into tm-dev
2022-05-04 04:10:05 +00:00
Stanley Wang
99c08f3167
Merge "Update the title of Model page" into tm-dev am: 32fa5502ca
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18137023
Change-Id: I54136d376ce65122dcee68571be5f423992eff90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 04:05:45 +00:00
Neil Fuller
32a00bf719
Merge "Capitalize TZ display name strings" am: 6a44151bc1
am: 3bb5fc5da8
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2055886
Change-Id: Id446433bafe4517f4822abdd1c49bfde99422a40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 04:04:52 +00:00
ykhung
3d1b6fd065
Add a mechanism to configure whether the summary should be set or not
...
Add a mechanism to customize whether the summary information in the
battery entry should be set or not. We can consider is as the extension
for the ag/18062824.
Bug: 220717612
Test: make RunSettingsRoboTests -j56 ROBOTEST_FILTER="com.android.settings.fuelgauge"
Change-Id: I3c21148d288f29ce65378f59f9086dab90c14a7b
2022-05-04 11:42:26 +08:00
Stanley Wang
32fa5502ca
Merge "Update the title of Model page" into tm-dev
2022-05-04 03:15:45 +00:00
Chaohui Wang
179ab49964
Merge "Add the jank detection to Settings sliders" into tm-dev am: b3db0000a6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944586
Change-Id: Ifceba0c8641a36cd8985caa49bbe8719eea3e635
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 02:36:46 +00:00
Weng Su
2d3d9b9305
Hide Wi-Fi toggle in the Wi-Fi slice
...
- Hide Wi-Fi toggle and show restriction message in the Wi-Fi slice if Wi-Fi state is disallowed to change
- See the result screenshot in b/203168097#comment30
Bug: 203168097
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiSliceTest
Change-Id: I09ccb6349dadf64a2f903245ba203ce77c86d1e1
2022-05-04 10:26:50 +08:00
Chaohui Wang
b3db0000a6
Merge "Add the jank detection to Settings sliders" into tm-dev
2022-05-04 02:23:14 +00:00
TreeHugger Robot
8fdc4458ae
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: c5148a79ad
-s ours am: f32c08af1d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18099387
Change-Id: Ie3f2354c9162e2f155a48674ece71a3818db6813
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 01:31:04 +00:00
Bill Yi
16fe14a809
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 51fef3196f
-s ours am: ee38ae11ca
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18099387
Change-Id: Id2f2ee63bdb5059029e9aa70ae5473f6b11ac388
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 01:30:55 +00:00
TreeHugger Robot
8d0c594d9a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 5cc53736d8
-s ours am: 93a954046f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18099388
Change-Id: I0b982ba5a359b3fdfb967062d7222ddde50fed9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 01:29:41 +00:00
Bill Yi
81d691ad75
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2141602328
-s ours am: 6944f72f53
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18099388
Change-Id: I90fed578680f055d43975a90f3a5e1c2162908c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 01:29:25 +00:00
TreeHugger Robot
6389cb3f8d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: c714da6092
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18099395
Change-Id: Iaecdd3202593c7f84cd6e779d79cac5d4edd0742
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 01:20:24 +00:00
Bill Yi
74507642b1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f86842f0a2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18099395
Change-Id: I4d4df6d4ea79c3aa509a10574d8f041b4837e6dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 01:19:57 +00:00
TreeHugger Robot
f32c08af1d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: c5148a79ad
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18099387
Change-Id: I0123563e51c4dc282e0aba58fb51d08980f9d40c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 01:18:22 +00:00
Bill Yi
ee38ae11ca
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 51fef3196f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18099387
Change-Id: I90d9567d06f163e2e47a6ad7522f86355ecc272c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 01:18:11 +00:00
TreeHugger Robot
b30ca6974e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 43ba3f6310
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18104364
Change-Id: Ib62e260acff5d5752062eb6992b4aa666be6eaf0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 01:16:43 +00:00
Bill Yi
d3d4832f60
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 472713f47c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18104364
Change-Id: I75373ff6bfe903e80e6eac9f016466e973474ed7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 01:16:00 +00:00
TreeHugger Robot
93a954046f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 5cc53736d8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18099388
Change-Id: I637f9d638000e16c1ca16fb15375826069152cd8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 01:14:59 +00:00
Bill Yi
6944f72f53
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2141602328
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18099388
Change-Id: I7a46b2d7667905a79a7eebbe979167545e40865c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 01:14:35 +00:00
Xin Li
c3a9ea7443
Merge SP2A.220505.002
...
Bug: 231319788
Merged-In: I1def7b37184d6d81f29a5e6e4793b92012dacd9b
Change-Id: I225d05e638e099971b596b8ceeb8bf7bcd8778bd
2022-05-03 20:53:03 +00:00
TreeHugger Robot
c5148a79ad
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2022-05-03 20:49:10 +00:00
TreeHugger Robot
c714da6092
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-05-03 20:48:33 +00:00
TreeHugger Robot
5cc53736d8
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2022-05-03 20:47:12 +00:00
TreeHugger Robot
43ba3f6310
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-05-03 20:45:18 +00:00