Commit Graph

119278 Commits

Author SHA1 Message Date
jasonwshsu
829a671265 Fix preferences under Related category can not launch its own page in bluetooth device details page
Root Cause: KeyboardSettingsPreferenceController override
handlePreferenceTreeClick() without checking the preference key, it will lead to handle all preferences' click action.

Solution: Check the preference is the expected preference key

Bug: 264017256
Test: make RunSettingsRoboTests ROBOTEST_FILTER=KeyboardSettingsPreferenceControllerTest
Change-Id: Idcdadc323df5b758b4b21329227e2bb721b1c394
2023-01-05 10:48:55 +00:00
Yilin Cai
181119f0b5 Merge "Add mapping to the WiFi-control SPA page in Settings app." 2023-01-05 10:15:23 +00:00
Weng Su
a396a4d8b9 Refine TetherSettings with ViewModel
- Use ViewModel to handle the TetheringManager's lifecycle.

- Use LiveData to observe TetheredInterfaces's changes instead of callbacks.

Bug: 246531382
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=TetherSettingsTest
atest -c TetheringManagerModelTest

Change-Id: Ib1a710a19a5340f63401a37b5c2b0bc307ac82f0
2023-01-05 17:13:57 +08:00
Chaohui Wang
c1f7222273 Merge "Move product specific strings to res-product" 2023-01-05 08:55:25 +00:00
William Escande
377d52bfc1 Merge "Fix NPE in BluetoothPairingController when comparing BluetoothClass" am: 9aa06f28e8 am: ce2edfa3d4 am: 1da99510b1
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2373748

Change-Id: Ib68558e8896e5bd282eacd34f2bc2044bed5f54c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-05 07:37:29 +00:00
William Escande
1da99510b1 Merge "Fix NPE in BluetoothPairingController when comparing BluetoothClass" am: 9aa06f28e8 am: ce2edfa3d4
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2373748

Change-Id: I3346dba2aa9751bc77c17287dfe5d31759c05607
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-05 07:02:43 +00:00
Automerger Merge Worker
0b3f453482 Merge changes from topic "am-91f40f2244d9481a9ec129c7853b46c4"
* changes:
  [automerger skipped] Merge "Revert "Use Mockito 4.6.1 API"" into tm-qpr-dev am: d6a9cba834 -s ours am: 98e202f98f -s ours
  [automerger skipped] Revert "Use Mockito 4.6.1 API" am: 869fd2f33e -s ours am: d5504ea567 -s ours
2023-01-05 06:34:16 +00:00
Zaiyue Xue
f1fd444c6d Merge "[Battery usage U] Add an item "Others" in the app list to group small usage apps. This will make the total percetage 100%, which is easy to understand for users." 2023-01-05 06:34:02 +00:00
Karen Lu
06e92c91a7 [automerger skipped] Merge "Revert "Use Mockito 4.6.1 API"" into tm-qpr-dev am: d6a9cba834 -s ours am: 98e202f98f -s ours
am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 e2b0873f9c is already in history. Merged-In was found from reverted change.

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

Change-Id: I4d506c77c0cae15ef1ff28f4441b47688896b35f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-05 06:32:58 +00:00
Karen Lu
d4904264fb [automerger skipped] Revert "Use Mockito 4.6.1 API" am: 869fd2f33e -s ours am: d5504ea567 -s ours
am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 e2b0873f9c is already in history. Merged-In was found from reverted change.

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

Change-Id: If4036793e7c74e759e4ba9b738e9dbdbc9dc36e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-05 06:32:42 +00:00
William Escande
ce2edfa3d4 Merge "Fix NPE in BluetoothPairingController when comparing BluetoothClass" am: 9aa06f28e8
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2373748

Change-Id: I11c236f3901c9faaeb6c702678d330dde8f07f38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-05 06:31:44 +00:00
Chaohui Wang
01c31d77e0 Move product specific strings to res-product
Product specific strings need to be put in res-product.

Bug: 250807976
Test: Make Settings
Change-Id: I59fe9f54759a518468395ae6e1448c97d952e22d
2023-01-05 14:18:30 +08:00
Yilin Cai
772f3b370b Add mapping to the WiFi-control SPA page in Settings app.
Test: local device + logcat
Bug: 262206181
Change-Id: Iafa2851a5a7c8770fc1b15cdfefaf37a17d55750
2023-01-05 14:18:25 +08:00
William Escande
9aa06f28e8 Merge "Fix NPE in BluetoothPairingController when comparing BluetoothClass" 2023-01-05 05:59:38 +00:00
Karen Lu
98e202f98f [automerger skipped] Merge "Revert "Use Mockito 4.6.1 API"" into tm-qpr-dev am: d6a9cba834 -s ours
am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 e2b0873f9c is already in history. Merged-In was found from reverted change.

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

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

Change-Id: Ia7bc9e7c7a6b876fa2b7d0fb2dc254c04a755dab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-05 05:58:09 +00:00
Karen Lu
d5504ea567 [automerger skipped] Revert "Use Mockito 4.6.1 API" am: 869fd2f33e -s ours
am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 e2b0873f9c is already in history. Merged-In was found from reverted change.

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

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

Change-Id: I2dd83ff0750ae656a6c6bf916437bd107c172940
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-05 05:57:49 +00:00
Tom Hsu
8d13ea9e64 Merge "[Regional Preference] Create each page for regional preferences" 2023-01-05 05:34:10 +00:00
Karen Lu
d6a9cba834 Merge "Revert "Use Mockito 4.6.1 API"" into tm-qpr-dev 2023-01-05 05:22:28 +00:00
Karen Lu
869fd2f33e Revert "Use Mockito 4.6.1 API"
Revert submission 20749672-cherrypick-robo-mockito-4.6.1-4rg619yrrf

Reason for revert: Breaking the build on tm-qpr-dev. Bug tracked here: b/264473028

Reverted changes: /q/submissionid:20749672-cherrypick-robo-mockito-4.6.1-4rg619yrrf

Change-Id: Ie9d9d944093752f44eff67627e4a35f4df47e6de
2023-01-05 05:15:10 +00:00
Chaohui Wang
c14729295e Merge "Move common startUninstallActivity to AppUtil" 2023-01-05 03:50:28 +00:00
Chaohui Wang
588001bba8 Merge "Redirect the TogglePermission App Info pages" 2023-01-05 03:49:52 +00:00
Zaiyue Xue
7c987c9d98 [Battery usage U] Add an item "Others" in the app list to group small usage apps. This will make the total percetage 100%, which is easy to understand for users.
Bug: 258124173
Fix: 258124173
Test: manual
Change-Id: I5965eeb73a2071c4a9994655e4ed24ec3adf64e8
2023-01-05 11:22:33 +08:00
tom hsu
278f2b07f4 [Regional Preference] Create each page for regional preferences
- Temperature unit
 - Calendar type
 - First day of week

Bug: b/246929960
Bug: b/247072550
Bug: b/247071792
Bug: b/247071572
Test: atest passed
Test: Manual test passed

Change-Id: Iea093588da33b352b5e7bfa5c483659e7afb8296
2023-01-05 10:10:44 +08:00
Grace Cheng
1c8455dfea Merge "Adding product string variants on choose lock page" into tm-qpr-dev am: a301ba8a68 am: 40fccabd62
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20853551

Change-Id: I03a3823880db1400d7bd63d7edf04a2b46411cca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-04 21:40:53 +00:00
Matt Pietal
c617ae851d Update wallet setting availability
For devices that don't support wallet, don't even show the setting in
a disabled state, which can cause confusion and lead the user to
believe they can enable it somehow.

Fixes: 251089510
Test: WalletPrivacyPreferenceControllerTest
Change-Id: I5d60957f24712bb4d75e72fa5f64cab35b6d6a5f
2023-01-04 21:39:43 +00:00
Grace Cheng
40fccabd62 Merge "Adding product string variants on choose lock page" into tm-qpr-dev am: a301ba8a68
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20853551

Change-Id: I7f51cad43e1a26e6cc421b8aa03106f545fc84fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-04 20:53:32 +00:00
Victor Truong
f03a60c67e Change screensaver option to be available to MainUser.
Bug: 262568884
Test: atest ScreenSaverPreferenceControllerTest
Change-Id: Ic9a9fc727cd0ce5311faa3dfc6e0ca8ce47605d7
2023-01-04 15:36:27 -05:00
Grace Cheng
a301ba8a68 Merge "Adding product string variants on choose lock page" into tm-qpr-dev 2023-01-04 20:30:37 +00:00
Bill Yi
c286104951 Merge TQ1A.230105.002 to stage-aosp-master - DO NOT MERGE
Merged-In: I77029014d72b8ac9b579357550f031bef20e32cb
Change-Id: I6914d3ec2ed74ae9decf80bf016b9d27cbf248a4
2023-01-04 11:23:10 -08:00
Yanting Yang
86914bedc8 Add DISALLOW_APPS_CONTROL check into uninstall app for all users
Settings App info page supports a "Uninstall for all users" function
when multiple users are enabled. It bypasses the restriction of
DISALLOW_APPS_CONTROL which breaks the user isolation guideline.

To fix this vulnerability, we should check the DISALLOW_APPS_CONTROL
restriction to provide the "Uninstall for all users" function.

Bug: 258653813
Test: manual & robotests
Change-Id: I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6
Merged-In: I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6
2023-01-04 18:59:18 +00:00
Yanting Yang
1a43a98334 Add DISALLOW_APPS_CONTROL check into uninstall app for all users
Settings App info page supports a "Uninstall for all users" function
when multiple users are enabled. It bypasses the restriction of
DISALLOW_APPS_CONTROL which breaks the user isolation guideline.

To fix this vulnerability, we should check the DISALLOW_APPS_CONTROL
restriction to provide the "Uninstall for all users" function.

Bug: 258653813
Test: manual & robotests
Change-Id: I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6
Merged-In: I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6
2023-01-04 18:58:32 +00:00
Yanting Yang
16500a7ada Add DISALLOW_APPS_CONTROL check into uninstall app for all users
Settings App info page supports a "Uninstall for all users" function
when multiple users are enabled. It bypasses the restriction of
DISALLOW_APPS_CONTROL which breaks the user isolation guideline.

To fix this vulnerability, we should check the DISALLOW_APPS_CONTROL
restriction to provide the "Uninstall for all users" function.

Bug: 258653813
Test: manual & robotests
Change-Id: I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6
Merged-In: I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6
2023-01-04 18:56:58 +00:00
Yanting Yang
0616b484e9 Add DISALLOW_APPS_CONTROL check into uninstall app for all users
Settings App info page supports a "Uninstall for all users" function
when multiple users are enabled. It bypasses the restriction of
DISALLOW_APPS_CONTROL which breaks the user isolation guideline.

To fix this vulnerability, we should check the DISALLOW_APPS_CONTROL
restriction to provide the "Uninstall for all users" function.

Bug: 258653813
Test: manual & robotests
Change-Id: I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6
Merged-In: I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6
2023-01-04 18:56:09 +00:00
Bill Yi
028b54d870 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I013d4acaa322b4aaa3e86a2dbc7076f9d6fad4d0
2023-01-04 09:40:23 -08:00
Bill Yi
7c9e45aa7f Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I812eac5b1fa960b6128466885b6fd18661ec73e8
2023-01-04 09:37:46 -08:00
Bill Yi
38268df283 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ie79ca403bec54dde34679db06de8813e5aaedc77
2023-01-04 09:36:13 -08:00
Bill Yi
27475aaed6 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I28455e9f43d4d44da8708dd15056e2493c017218
2023-01-04 09:32:28 -08:00
Bill Yi
6480a5ff9c Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ia1c2df934afa7f83fb9990b59be46adaf88c2329
2023-01-04 09:29:44 -08:00
Bill Yi
1c4c4b07c5 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: If343e1104b35ab0eca0946fc93a32fc0a114902f
2023-01-04 09:28:14 -08:00
Becca Hughes
38fface579 Fix bug in credential manager settings (dialogs)
The dialogs crash when opened because they
need to be public so they can be recreated.

Bug: 253157366
Test: make & manual test
Change-Id: I5ad8d5e49be7c0f926b9d4e3383109aae398925b
2023-01-04 17:27:32 +00:00
Bill Yi
b86ae4bb50 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I5d28e44a6d272d07162b36529a1bcd8a01c837ce
2023-01-04 09:26:00 -08:00
Becca Hughes
71c948ce7b Add credential manager team to OWNERS
Adds Credential Manager team to owners
for where our settings UI lives (see
internal CL).

Change-Id: I0674b170c9b96e7e7dedbb5be63fa3929f292274
Test: presubmit
Bug: 253157366
2023-01-04 17:24:35 +00:00
Bill Yi
054685b7d0 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ie82ddd3aa71db3d215f09dcff5c54cd51e5dc3b7
2023-01-04 09:22:53 -08:00
Bonian Chen
feb6c451e3 Merge "[Settings] Adjust string resource for ID" 2023-01-04 17:06:11 +00:00
Vania Januar
e5651cd86e Replace placeholder ROLE_ASSISTANT with ROLE_NOTES.
Bug: 254834764
Test: StylusDevicesController
Change-Id: I2303034180f9609db8f1a6d663c389a55dd04600
2023-01-04 16:22:38 +00:00
Yanting Yang
9191ec13e2 Add DISALLOW_APPS_CONTROL check into uninstall app for all users
Settings App info page supports a "Uninstall for all users" function
when multiple users are enabled. It bypasses the restriction of
DISALLOW_APPS_CONTROL which breaks the user isolation guideline.

To fix this vulnerability, we should check the DISALLOW_APPS_CONTROL
restriction to provide the "Uninstall for all users" function.

Bug: 258653813
Test: manual & robotests
Change-Id: I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6
Merged-In: I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6
2023-01-04 16:21:24 +00:00
Yanting Yang
22e4eebafe Add DISALLOW_APPS_CONTROL check into uninstall app for all users
Settings App info page supports a "Uninstall for all users" function
when multiple users are enabled. It bypasses the restriction of
DISALLOW_APPS_CONTROL which breaks the user isolation guideline.

To fix this vulnerability, we should check the DISALLOW_APPS_CONTROL
restriction to provide the "Uninstall for all users" function.

Bug: 258653813
Test: manual & robotests
Change-Id: I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6
Merged-In: I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6
2023-01-04 16:16:34 +00:00
Yanting Yang
f3b323e378 Add DISALLOW_APPS_CONTROL check into uninstall app for all users
Settings App info page supports a "Uninstall for all users" function
when multiple users are enabled. It bypasses the restriction of
DISALLOW_APPS_CONTROL which breaks the user isolation guideline.

To fix this vulnerability, we should check the DISALLOW_APPS_CONTROL
restriction to provide the "Uninstall for all users" function.

Bug: 258653813
Test: manual & robotests
Change-Id: I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6
Merged-In: I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6
2023-01-04 16:15:16 +00:00
Yanting Yang
cb4edec31b Merge "Add DISALLOW_APPS_CONTROL check into uninstall app for all users" 2023-01-04 16:11:47 +00:00
TreeHugger Robot
6e71b35ccc Merge "Combine system apps to one item in the battery usage app list." 2023-01-04 16:05:42 +00:00