Commit Graph

129991 Commits

Author SHA1 Message Date
TreeHugger Robot
4f3f92d3d6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 34ee142399 -s ours am: a93397786a -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467681

Change-Id: If1f201c41de40ce7ee10d922d39c4f6cc7cff992
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-01 21:45:23 +00:00
Bill Yi
fea0378937 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f97401447 -s ours am: 13df8b2d97 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467681

Change-Id: Ifbe80a52951f72788a6cd4b8c7f25251a0bb87f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-01 21:45:17 +00:00
Weng Su
ef81179538 Skip Wi-Fi hotspot in Settings Widgets
- Do not show Wi-Fi hotspots in Settings Widgets if the config is not set to show

Bug: 275268676
Test: Manual test
atest -c CreateShortcutPreferenceControllerTest

Change-Id: I5d86a78c9d48c9b63faff50d46f1254dbefd94cf
2023-06-02 04:54:59 +08:00
Hao Dong
9b4e923986 Fix the flicker of buttons in FaceSettings.
Test: manual test - 1. enroll a face 2. open face settings 3. there is
no flicker
Bug: 273408521

Change-Id: I34d069cb1dbaa4bc38671dc37e3c8fe285f700aa
2023-06-01 20:47:07 +00:00
Justin Gross
d96911734c Enable vendors to add preference controllers in mobile network settings
Implement AbstractSubscriptionPreferenceController so that vendor code
can add preference controllers to MobileNetworkSettings.

Bug: 280323952
Test: manual
Change-Id: I6b1916d8956ebd4163958155a448e7fb27942951
2023-06-01 20:33:23 +00:00
Viesturs Zarins
c3aff24230 Merge "One more fix for missing Activity embedding allowlisting for Assistant." into udc-d1-dev am: bd60552454 am: 1740b0fb94 am: 9525407d86
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23517276

Change-Id: I744bad3f9dcc1b525b8817c265dbf1787b80655d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-01 20:07:49 +00:00
Viesturs Zarins
9525407d86 Merge "One more fix for missing Activity embedding allowlisting for Assistant." into udc-d1-dev am: bd60552454 am: 1740b0fb94
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23517276

Change-Id: I84572e61a0c9d333d39581ff0caa58ea59a313bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-01 19:18:48 +00:00
Treehugger Robot
0a9fe7a3ab Merge "Adding ShadowBluetoothAdapter for the test" 2023-06-01 18:52:02 +00:00
Viesturs Zarins
1740b0fb94 Merge "One more fix for missing Activity embedding allowlisting for Assistant." into udc-d1-dev am: bd60552454
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23517276

Change-Id: I4ce4bd8a014bfb3b73b64bc2f6eaa60dba1b20e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-01 18:35:05 +00:00
Viesturs Zarins
628618e837 Merge "One more fix for missing Activity embedding allowlisting for Assistant." into udc-d1-dev am: bd60552454 am: d16cabe8be am: b4445b54ee
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23517276

Change-Id: I66b8a63b074df2ee4bc18a064e0ab7361e73c41a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-01 18:24:20 +00:00
Prabir Pradhan
edbc95e817 Merge "Add "Show key presses" to input developer options" into udc-qpr-dev am: 8fca8a72dc am: 753647d584
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23356796

Change-Id: I9c43018307252742022d19443c3423fa4ee05550
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-01 18:24:09 +00:00
Pavel Grafov
0febeaf10c Merge "Avoid double quiet mode requests" into udc-dev am: 8e13abebc0 am: 4c5394afb3 am: 81e7bac047 am: ca5faa59bb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23489320

Change-Id: Ic2a59515cdc3534472b95f7ad0d5bf21b28b4cd7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-01 18:21:18 +00:00
Viesturs Zarins
b4445b54ee Merge "One more fix for missing Activity embedding allowlisting for Assistant." into udc-d1-dev am: bd60552454 am: d16cabe8be
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23517276

Change-Id: I0a4bcac3a844f65bb5478ec598f3251bd883369c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-01 18:20:55 +00:00
Pavel Grafov
f706596ec3 Merge "Avoid double quiet mode requests" into udc-dev am: 8e13abebc0 am: 4c5394afb3 am: 9de781781a am: 8be7a132de
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23489320

Change-Id: I0ac3a895005dd03edfc8e052b95c538edcd63b93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-01 18:20:47 +00:00
Prabir Pradhan
753647d584 Merge "Add "Show key presses" to input developer options" into udc-qpr-dev am: 8fca8a72dc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23356796

Change-Id: Icc77794741fcbeb32726dddc972d75819b77428a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-01 18:18:33 +00:00
Pavel Grafov
ca5faa59bb Merge "Avoid double quiet mode requests" into udc-dev am: 8e13abebc0 am: 4c5394afb3 am: 81e7bac047
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23489320

Change-Id: I7326aadc1ac511fc9a43888c421c8965b26c15a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-01 18:16:29 +00:00
Pavel Grafov
1fe81d1683 Merge "Avoid double quiet mode requests" into udc-dev am: 8e13abebc0 am: 4aef4043aa am: fa0a6b46dc am: fe800cc8a1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23489320

Change-Id: I33a2b2e37ec2ada97fea1e58fc9771e7565df4b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-01 18:16:05 +00:00
Pavel Grafov
8be7a132de Merge "Avoid double quiet mode requests" into udc-dev am: 8e13abebc0 am: 4c5394afb3 am: 9de781781a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23489320

Change-Id: Ic7219d38c78d16639f79a5f785cfa78d112cbb5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-01 17:52:07 +00:00
Viesturs Zarins
d16cabe8be Merge "One more fix for missing Activity embedding allowlisting for Assistant." into udc-d1-dev am: bd60552454
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23517276

Change-Id: I097068654c6a38fd0d9ccdad0ee05e928d8691b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-01 17:50:48 +00:00
Chun-Ku Lin
b34dcecc58 Adding ShadowBluetoothAdapter for the test
Many robotests that touches BluetoothAdapter might need to use our own
ShadowBluetoothAdapter which implements a "fake" getSupportedProfiles
call, so that the test won't trying to execute the android framework's getSupportedProfiles method.

Bug: 285235777
Test: atest AccessibilitySettingsTest

Change-Id: I5b3b2f4528a2b32aff22928653c57576981c0ff9
2023-06-01 17:50:10 +00:00
Viesturs Zarins
bd60552454 Merge "One more fix for missing Activity embedding allowlisting for Assistant." into udc-d1-dev 2023-06-01 17:38:21 +00:00
Prabir Pradhan
8fca8a72dc Merge "Add "Show key presses" to input developer options" into udc-qpr-dev 2023-06-01 17:37:44 +00:00
Pavel Grafov
81e7bac047 Merge "Avoid double quiet mode requests" into udc-dev am: 8e13abebc0 am: 4c5394afb3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23489320

Change-Id: I8ce1a31df186ab0a396c8b0858286fd1cc53f740
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-01 17:35:41 +00:00
Pavel Grafov
9de781781a Merge "Avoid double quiet mode requests" into udc-dev am: 8e13abebc0 am: 4c5394afb3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23489320

Change-Id: I51adff067a14ebf25999da538501a373f0b2eca6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-01 17:27:53 +00:00
Pavel Grafov
fe800cc8a1 Merge "Avoid double quiet mode requests" into udc-dev am: 8e13abebc0 am: 4aef4043aa am: fa0a6b46dc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23489320

Change-Id: Ice3fb038905d559362ebcbcf66bdb9a047e93e2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-01 17:26:37 +00:00
Pavel Grafov
fa0a6b46dc Merge "Avoid double quiet mode requests" into udc-dev am: 8e13abebc0 am: 4aef4043aa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23489320

Change-Id: Ibec147373fadf2c5a8a7550b541b75961fb41a3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-01 16:46:35 +00:00
Pavel Grafov
40897d4bec Merge "Avoid double quiet mode requests" into udc-dev am: 8e13abebc0 am: fb15f59582
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23489320

Change-Id: I3411ef7f49b9327690c07e5413ba3dbaf95064a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-01 16:41:23 +00:00
Pavel Grafov
4c5394afb3 Merge "Avoid double quiet mode requests" into udc-dev am: 8e13abebc0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23489320

Change-Id: I6a82013b578378facf575a6daa9070ff337d0fc4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-01 16:38:28 +00:00
Viesturs Zarins
8e33f2e52b One more fix for missing Activity embedding allowlisting for Assistant.
The normal settings fragments are already allowlisted via SubSettingActivity.
ManageApplications fragment based activities are not compatible with that however.

ManageApplications internally launches Spa activity, so that needs to be allowlisted as well.

For more context, see
go/conversational-care-activity-embedding-allowlisting

BUG: 282921726

Change-Id: I4765bd6ba8006a56bc8b7016f57dac2188a14592
2023-06-01 16:30:51 +00:00
Pavel Grafov
fb15f59582 Merge "Avoid double quiet mode requests" into udc-dev am: 8e13abebc0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23489320

Change-Id: Id36ddfac67a9d2f4c8caf886e1db283f6aba4fe1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-01 16:01:34 +00:00
Pavel Grafov
4aef4043aa Merge "Avoid double quiet mode requests" into udc-dev am: 8e13abebc0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23489320

Change-Id: I9eaafcb4e1ce813e8775cbce0c6eda5137e922fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-01 15:57:28 +00:00
Pavel Grafov
8e13abebc0 Merge "Avoid double quiet mode requests" into udc-dev 2023-06-01 15:31:13 +00:00
Patty Huang
3e980c7c8f Default show LE audio toggle in Device Detail
Bug: 284790607
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothLeAudioDeviceDetailsPreferenceControllerTest
Test: Checks the LE Audio toggle is shown in Device Detail by default
Change-Id: Id301815513e8066941d3e4c44ab2e7b4d5ed011b
2023-06-01 20:36:34 +08:00
Angela Wang
6451a35d3e Merge "Shouldn't show pair another ear dialog if hearing aid supports CSIP" into udc-qpr-dev am: d91da4f4ca am: 4560d2f83b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23412076

Change-Id: I782742799c995339e9f00ba2265acd84fb2ee3a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-01 12:24:00 +00:00
Angela Wang
4560d2f83b Merge "Shouldn't show pair another ear dialog if hearing aid supports CSIP" into udc-qpr-dev am: d91da4f4ca
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23412076

Change-Id: I3e99952c7148cffd16d87487733fcc12731a3211
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-01 11:41:38 +00:00
Angela Wang
d91da4f4ca Merge "Shouldn't show pair another ear dialog if hearing aid supports CSIP" into udc-qpr-dev 2023-06-01 11:04:31 +00:00
Cao Peng
38f1b45d50 Fix resource leakage caused by cursor
Change-Id: I9507658cc82a2b9760507530920a37044f7de2fd
Signed-off-by: Jia Jia <jia.jia@zte.com.cn>
2023-06-01 18:16:26 +08:00
Angela Wang
1bc59caf13 Shouldn't show pair another ear dialog if hearing aid supports CSIP
Some devices may supports both ASHA and CSIP. If the device supports
CSIP, it'll automatically pair the other ear and thus no need to pop up
the pair another ear dialog which is specially for ASHA device.

Bug: 283269736
Test: make RunSettingsRoboTests ROBOTEST_FILTER=HearingAidUtilsTest
Change-Id: I9a8e3876e2905b18b1c63e74f47c6877504ebdc8
2023-06-01 09:54:35 +00:00
Chaohui Wang
9ab4ef224e Hide Show System on SPA version App languages
To align with non-SPA version.

Fix: 285264906
Test: Visual check on App languages
Change-Id: I7f8b0aec0e33fcb46939075458a8b0a710fac640
2023-06-01 09:20:42 +00:00
TreeHugger Robot
f1810ad7de Merge "Fix TetherSettings crash issue" into udc-dev am: f65da39f37 am: 9f831a600b am: c57d3de706 am: 651ab436fe
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23485222

Change-Id: I3c01e0a021a2ea8de3c30c647818189ff40dd8da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-01 08:25:02 +00:00
TreeHugger Robot
09e6aa43c2 Merge "Fix TetherSettings crash issue" into udc-dev am: f65da39f37 am: 28c9000bb7 am: 660be7a1f7 am: d080579f54
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23485222

Change-Id: I98e9f2893f0fb6d047ae6f362943b7c8e9408319
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-01 08:24:46 +00:00
TreeHugger Robot
57f5442214 Merge "Fix TetherSettings crash issue" into udc-dev am: f65da39f37 am: 9f831a600b am: 60de9941fb am: f8d5aca736
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23485222

Change-Id: Ie64615499e41ba751b7267f636ce0a1f2aaf60bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-01 08:23:27 +00:00
Jason Chiu
2560c0df9b Do not init dashboard categories when SetupWizard isn't finished yet
The generated category cache during SetupWizard flow is invalid.

Bug: 261885832
Test: manual
Change-Id: Id2108b2cc4ab557b086c4dbbd5dc7722c73e74d3
2023-06-01 16:07:53 +08:00
TreeHugger Robot
651ab436fe Merge "Fix TetherSettings crash issue" into udc-dev am: f65da39f37 am: 9f831a600b am: c57d3de706
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23485222

Change-Id: Ib9e80549565b7569499d77a140f6dacecd659a0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-01 07:36:27 +00:00
TreeHugger Robot
d080579f54 Merge "Fix TetherSettings crash issue" into udc-dev am: f65da39f37 am: 28c9000bb7 am: 660be7a1f7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23485222

Change-Id: Iad8ddd8865edcde90ca077e8773228d354afbaaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-01 07:32:22 +00:00
TreeHugger Robot
f8d5aca736 Merge "Fix TetherSettings crash issue" into udc-dev am: f65da39f37 am: 9f831a600b am: 60de9941fb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23485222

Change-Id: I8a4dfd2c636be1359f91dd907aec371749ed839a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-01 07:30:07 +00:00
Chaohui Wang
0937c24f8f Unify the strings for Erase eSIM / eUICC
erase_sim_confirm_button & erase_euicc_data_button are the same string
and with same meanings, but since the description of
erase_euicc_data_button is wrong and causes translate issue, clean up
erase_euicc_data_button then.

Fix: 279600315
Test: Visual check on Erase eSIMs dialog
Change-Id: I5dec3dd5c1e851f84dd401dddd5416a27cb1a428
2023-06-01 15:28:47 +08:00
TreeHugger Robot
660be7a1f7 Merge "Fix TetherSettings crash issue" into udc-dev am: f65da39f37 am: 28c9000bb7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23485222

Change-Id: I0046c19bd45ed68c75f3a099c0558337a56c78c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-01 05:46:59 +00:00
TreeHugger Robot
c57d3de706 Merge "Fix TetherSettings crash issue" into udc-dev am: f65da39f37 am: 9f831a600b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23485222

Change-Id: I15e5a054a77aafd21dcedea9b6a96a5b05b21e03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-01 05:46:26 +00:00
TreeHugger Robot
60de9941fb Merge "Fix TetherSettings crash issue" into udc-dev am: f65da39f37 am: 9f831a600b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23485222

Change-Id: If6b861c8c84aafae60c2d74a86f5bf4c276462eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-01 05:43:22 +00:00