Commit Graph

125924 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
Chaohui Wang
b4758db2bd Merge "Update comment for Settings_srcs build target" into udc-qpr-dev am: c27682642f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23466979

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

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

Change-Id: I8d186dbc0615dd277d6bd2ffd0272beac0280a2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-01 04:57:15 +00:00
ykhung
e2f19b7de9 Update incompatible charger checking rule
Bug: 278316711
Test: make test RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.fuelgauge
Change-Id: I8f720bcdf7c0efabc8278913ccf1c0427c857fac
2023-06-01 12:50:47 +08:00
Chaohui Wang
c27682642f Merge "Update comment for Settings_srcs build target" into udc-qpr-dev 2023-06-01 03:31:45 +00:00
TreeHugger Robot
f65da39f37 Merge "Fix TetherSettings crash issue" into udc-dev 2023-06-01 03:11:20 +00:00
Angela Wang
5176db8a71 Merge "Make Hearing devices preference always visible" into udc-qpr-dev am: 7df08d69be
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23429459

Change-Id: I3e7126da14c0882753a6edb69d4455a4d3db5030
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-01 02:51:06 +00:00
Angela Wang
7df08d69be Merge "Make Hearing devices preference always visible" into udc-qpr-dev 2023-06-01 02:04:50 +00:00
TreeHugger Robot
4a1651b742 Merge "Add more search terms for WPP" into udc-dev am: 2484fa72d6 am: becebd3a55 am: 48381cbd0a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23436100

Change-Id: I3d1eff71edfed79705235612e69efc6032dd5030
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-01 00:08:03 +00:00
TreeHugger Robot
c7584308b8 Merge "Add more search terms for WPP" into udc-dev am: 2484fa72d6 am: becebd3a55 am: e8b09f4e08
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23436100

Change-Id: Ie8cbd41cb9f9cbbdc2b2f6c1c494a5a6e7cda096
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-31 23:39:53 +00:00
TreeHugger Robot
fee0027028 Merge "Add more search terms for WPP" into udc-dev am: 2484fa72d6 am: de73c2ff4f am: 6f4e93bf69
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23436100

Change-Id: Ib06e525c7b11a5438398e5d299fd575a2e200a63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-31 23:39:37 +00:00
TreeHugger Robot
48381cbd0a Merge "Add more search terms for WPP" into udc-dev am: 2484fa72d6 am: becebd3a55
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23436100

Change-Id: I097932611469fa2b7db783946c6e189a8aced28d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-31 23:17:37 +00:00
TreeHugger Robot
e8b09f4e08 Merge "Add more search terms for WPP" into udc-dev am: 2484fa72d6 am: becebd3a55
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23436100

Change-Id: Idb7ab9c55ecac681194919d8aeaab3fbcdf89c85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-31 23:15:19 +00:00
TreeHugger Robot
6f4e93bf69 Merge "Add more search terms for WPP" into udc-dev am: 2484fa72d6 am: de73c2ff4f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23436100

Change-Id: I56728e9c1d7dfac38b2969e16882be4d3f889c35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-31 22:55:15 +00:00
TreeHugger Robot
becebd3a55 Merge "Add more search terms for WPP" into udc-dev am: 2484fa72d6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23436100

Change-Id: I023988aa8e4e84af116b44a9c5fac1982b6183c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-31 22:34:47 +00:00
TreeHugger Robot
de73c2ff4f Merge "Add more search terms for WPP" into udc-dev am: 2484fa72d6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23436100

Change-Id: I7473173f5cb5c326e472af2091dfd472e10d5a2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-31 22:30:25 +00:00
TreeHugger Robot
2484fa72d6 Merge "Add more search terms for WPP" into udc-dev 2023-05-31 22:02:49 +00:00
Bill Yi
e2a3688d1a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: adefb73221 -s ours am: 2d3730c6e0 -s ours am: 482e804031 -s ours am: a78f524653 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I292b39a1ca16bc188bcbe3bac7a3801e59e4fb72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-31 21:27:43 +00:00