Bill Yi
7034e737b6
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 8c0d18ada4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18108381
Change-Id: Iad59e7632d6735b20e2400ae8fc33aee9dff6fc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 17:43:53 +00:00
Bill Yi
a467f9dcba
Merge changes from topic "tc_change_21" into tm-dev am: 261936eccf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18108381
Change-Id: I3e0f7907f7836ab2edb63dba3d4deeb431913b33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 17:41:07 +00:00
Bill Yi
58da6d7afd
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 192bd4e1f0
am: c50bf31396
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18108381
Change-Id: Ib180e8d399762411648d527ba4075f8b152f18da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 17:41:00 +00:00
Bill Yi
6b59002229
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 9349330a1f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18099393
Change-Id: I2e1f7b6a32e9e4261c6c512caa74d7a4f3aa69f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 17:40:48 +00:00
Bill Yi
da1aaa3069
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d0a12e0106
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18099393
Change-Id: Ic359719019638ea11ed7571906b3e04af3f5890f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 17:40:21 +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
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
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
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
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
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
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
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
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
680e9f0a0f
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: I80db9f0bda301b4f1b8d9e309e970ca7ba05f93b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 04:51:24 +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
e07c557ed6
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: I1b585ea03e075873011320f175a6cc48a18d7526
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 04:15:09 +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
766828b6f5
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: I22b633d74bca78f1e0816b8b41d96a39e6c71c89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 04:07:10 +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
8456f1d5e5
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: I702f1ce7d91277aa2fd0a3029690c74a00e38372
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 02:37:53 +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
73c4650b74
[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: Id59d43c8c53c63a709e36f992bee85197e9a8ec4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 01:38:56 +00:00
Bill Yi
eb50f1a254
[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: Ic7b564875eecc19522472038cefe5b1a8ea08dba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 01:38:45 +00:00
TreeHugger Robot
1ee8289cb3
[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: I3ac007f97fda9508ad841aecc10f5cf77c8d253a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 01:35:42 +00:00
Bill Yi
1473685f22
[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: Ie5377c4e960d84a8496ffc2f4d96f4f2814dada0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 01:35:26 +00:00
TreeHugger Robot
d903116617
[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: Ic1f09bfbaf3df7feed03fd2585032e063626c393
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 01:22:45 +00:00
Bill Yi
471a93781b
[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: Idd3d6ecae92bf38cde1fc6a83872a7ec366b73cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 01:22:27 +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
56012b6bb0
[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: I93430c476feecdd32599576cefe10738155909b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 01:17:09 +00:00
Bill Yi
4970b3783e
[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: I83d9202789b11983a8bf6e1c2d157330e16c8fc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 01:16:32 +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