PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
119,265 Commits 1 Branch 0 Tags
042f3aebfb92a45a2aaa924b02c781642d64b4cc
Commit Graph

119265 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Kevin Liu
476bb204ea [automerger skipped] Merge "Use Mockito 4.6.1 API" into tm-qpr-dev am: cb8c1c6c85 -s ours am: 8e2f0b970b -s ours 
am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 e2b0873f9c is already in history

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

Change-Id: I38667de33cb4c8bfc5d48c2001fe4216e1888210
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-04 15:59:48 +00:00
Sorin Basca
464a297b42 [automerger skipped] Use Mockito 4.6.1 API am: 93c143ed0a -s ours am: 407a35aa78 -s ours 
am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 e2b0873f9c is already in history

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

Change-Id: I99c30016e0ef99a5069953678a5fa5bb6c908c82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-04 15:59:32 +00:00
Kevin Liu
8e2f0b970b [automerger skipped] Merge "Use Mockito 4.6.1 API" into tm-qpr-dev am: cb8c1c6c85 -s ours 
am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 e2b0873f9c is already in history

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

Change-Id: I77029014d72b8ac9b579357550f031bef20e32cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-04 15:23:06 +00:00
Sorin Basca
407a35aa78 [automerger skipped] Use Mockito 4.6.1 API am: 93c143ed0a -s ours 
am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 e2b0873f9c is already in history

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

Change-Id: Ifab2083b414d8b4482c44e44a91049dd616d14b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-04 15:22:47 +00:00
Kevin Liu
cb8c1c6c85 Merge "Use Mockito 4.6.1 API" into tm-qpr-dev 2023-01-04 14:50:04 +00:00
Yanting Yang
18e77f27aa 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
 2023-01-04 12:39:27 +00:00
Zaiyue Xue
e756675e69 Combine system apps to one item in the battery usage app list. 
Bug: 262952385
Test: 262952385
Test: maunal
Change-Id: I078677b13a22f5e2f8f194bb5d5259f8c54c6b1e
 2023-01-04 20:32:56 +08:00
Treehugger Robot
47f6d387e7 Merge "Fix comment typo in BluetoothLengthDeviceNameFilter" am: 02888676a7 am: aa723a43dd am: 2fa3b95342 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2375748

Change-Id: I3df300aa4e8895ee4f3c0b8250e51b13920c1fa0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-04 12:27:50 +00:00
TreeHugger Robot
949dd58112 Merge "Replace battery usage breakdown list from tabs to dropdown list." 2023-01-04 12:17:41 +00:00
Treehugger Robot
2fa3b95342 Merge "Fix comment typo in BluetoothLengthDeviceNameFilter" am: 02888676a7 am: aa723a43dd 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2375748

Change-Id: I7248e9b4f45a82ecaf55a451817dc5e056ba6c4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-04 11:53:04 +00:00
Treehugger Robot
aa723a43dd Merge "Fix comment typo in BluetoothLengthDeviceNameFilter" am: 02888676a7 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2375748

Change-Id: Ic14cfd40900d12b1349a1e6905e1a92351c168e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-04 11:37:59 +00:00
Treehugger Robot
02888676a7 Merge "Fix comment typo in BluetoothLengthDeviceNameFilter" 2023-01-04 11:05:58 +00:00
Kuan Wang
3d5dfd5f61 Merge "Add null check to avoid NullPointerException." 2023-01-04 09:50:08 +00:00