Commit Graph

119070 Commits

Author SHA1 Message Date
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
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
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
Chaohui Wang
74b3bfc066 Add spinner options to "All apps"
Spinner options only shows when there is any disabled or instant apps.

Fix: 264228237
Test: Manually with Settings
Test: Unit test
Change-Id: I9f916c1076b2d754b8c5f30244eac5d5c0bc78f4
2023-01-04 17:06:12 +08:00
Chaohui Wang
4710cfc7ed Move common startUninstallActivity to AppUtil
And also suppress the warnings.

Bug: 236346018
Test: Unit test
Change-Id: I469e563fdeea0bec0587a255b15fddcaaab7f2c3
2023-01-04 16:58:39 +08:00
Yilin Cai
21a633d1ce Merge "Fork the Wi-Fi control setting page to SPA." 2023-01-04 08:46:14 +00:00
Shen Lin
85067c8136 Fix comment typo in BluetoothLengthDeviceNameFilter
Change-Id: I222d048e683bff4473849d26de50318b51a1eb9e
Test: manual
2023-01-04 08:46:12 +00:00
Chaohui Wang
afeb7496bb Remove EXTRA_USER_HANDLE from startSpaActivityForApp
Bug: 263553430
Test: Unit test
Change-Id: I6739d4518eac00cfe22905c1a6589b6e9f91a1d3
2023-01-04 16:26:04 +08:00
Zaiyue Xue
778a4b42e3 Replace battery usage breakdown list from tabs to dropdown list.
screen records:
https://drive.google.com/file/d/15VJGQ_G2KIpyFcvZsyE0iRno0WZhfjGb/view?usp=sharing&resourcekey=0-bg48BsC2b-BT_80CGlzpWg
https://drive.google.com/file/d/1RaoysytQ5oZQu8CNPhYgxqBahk3UfVbr/view?usp=sharing&resourcekey=0-Xk2J36fjYWBo6KpFTrMr4Q

Bug: 264338267
Fix: 264338267
Test: manual
Change-Id: Ic020cce711b5232adfc80272836d7c2d0250d94a
2023-01-04 16:20:47 +08:00
Chaohui Wang
b2344abd3b Redirect the TogglePermission App Info pages
To Spa, only when flag settings_enable_spa is enabled.

Bug: 263553430
Test: Manually with Settings
Change-Id: I12916989df5804e68fd82163b3670dfcb9241c1d
2023-01-04 08:19:54 +00:00
Kuan Wang
b2f8c095ac Add null check to avoid NullPointerException.
Test: make RunSettingsRoboTests
Bug: 264198981
Fix: 264198981
Change-Id: Ida2ff6beed5c0dba6329023b72e55daf1bf573f1
2023-01-04 07:08:37 +00:00
Tsung-Mao Fang
e4f2fb56f9 [automerger skipped] [DO NOT MERGE] FRP bypass defense in the settings app am: ff5bfb40c8 -s ours am: 4332b3266e -s ours am: ac092ac06f -s ours am: a5904fed59 -s ours am: 322e0d684d -s ours am: 6800574d8d -s ours am: e531e8e79f -s ours am: 50c13af93d -s ours am: e2532f29c1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I778686f42178879d709967ddfb184f3619e34e37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-04 06:02:53 +00:00
Tsung-Mao Fang
0a8b6a3e60 [automerger skipped] [DO NOT MERGE] FRP bypass defense in the settings app am: b34ff2f272 -s ours am: c923d29c08 -s ours am: e57ce41bf1 -s ours am: d9b063c4a8 -s ours am: 8c9e74c6c1 -s ours am: 8ab6eb1be3 -s ours am: ff41a2c13e -s ours am: 9c43d60fd1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id42c6e127cb4e2ffda84b3edf40f8614c81e4d59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-04 06:02:33 +00:00
TreeHugger Robot
7dfe918785 Merge "Launch settings for clicking fingerprint unlock" 2023-01-04 05:55:54 +00:00
Tsung-Mao Fang
e2532f29c1 [automerger skipped] [DO NOT MERGE] FRP bypass defense in the settings app am: ff5bfb40c8 -s ours am: 4332b3266e -s ours am: ac092ac06f -s ours am: a5904fed59 -s ours am: 322e0d684d -s ours am: 6800574d8d -s ours am: e531e8e79f -s ours am: 50c13af93d -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idfdac838b857f7bd159d303c0e5b7a6c637f6a5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-04 05:43:01 +00:00
Tsung-Mao Fang
9c43d60fd1 [automerger skipped] [DO NOT MERGE] FRP bypass defense in the settings app am: b34ff2f272 -s ours am: c923d29c08 -s ours am: e57ce41bf1 -s ours am: d9b063c4a8 -s ours am: 8c9e74c6c1 -s ours am: 8ab6eb1be3 -s ours am: ff41a2c13e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7ce2758a3e0cf093feaa5ca90f0c474b6a1b0b02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-04 05:42:41 +00:00
Tsung-Mao Fang
50c13af93d [automerger skipped] [DO NOT MERGE] FRP bypass defense in the settings app am: ff5bfb40c8 -s ours am: 4332b3266e -s ours am: ac092ac06f -s ours am: a5904fed59 -s ours am: 322e0d684d -s ours am: 6800574d8d -s ours am: e531e8e79f -s ours
am skip reason: subject contains skip directive

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

Change-Id: If4f5fc112b2faa52d3f646f4deddeb327e14eb2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-04 05:01:02 +00:00
Tsung-Mao Fang
ff41a2c13e [automerger skipped] [DO NOT MERGE] FRP bypass defense in the settings app am: b34ff2f272 -s ours am: c923d29c08 -s ours am: e57ce41bf1 -s ours am: d9b063c4a8 -s ours am: 8c9e74c6c1 -s ours am: 8ab6eb1be3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6e8d8f12d951a570b48dd8081df775be419e9378
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-04 05:00:54 +00:00
Arc Wang
465e7c4c9e [automerger skipped] Merge changes from topic "presubmit-am-8c4ee5d0c6b544bab2b8403178df17cc-sc-qpr1-dev-sc-dev" into sc-qpr1-dev am: 4b12201ec4 -s ours am: 57643513e3 -s ours am: 8cf511b709 -s ours am: 9ab2f7b65b -s ours am: 1e2d9162c2 -s ours am: 4fd3532821 -s ours
am skip reason: Merged-In Ia18f367109df5af7da0a5acad7702898a459d32e with SHA-1 22869d9019 is already in history

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

Change-Id: Ia89af876603a5a77eb1458b1cdcc582e898aeefd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-04 04:30:57 +00:00
Tsung-Mao Fang
a9ef5cce36 [automerger skipped] [automerge] FRP bypass defense in the settings app 2p: 71f2d83688 am: 1ebb665b71 -s ours am: fc17db496f -s ours am: ee39631cdb -s ours am: f70458cdd9 -s ours am: 84a63ef6ce -s ours am: be972c495d -s ours
am skip reason: Merged-In Ia18f367109df5af7da0a5acad7702898a459d32e with SHA-1 22869d9019 is already in history

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

Change-Id: Ic92bb83970b9c8962ea30041a162b1be4ced2810
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-04 04:30:55 +00:00
Tsung-Mao Fang
e531e8e79f [automerger skipped] [DO NOT MERGE] FRP bypass defense in the settings app am: ff5bfb40c8 -s ours am: 4332b3266e -s ours am: ac092ac06f -s ours am: a5904fed59 -s ours am: 322e0d684d -s ours am: 6800574d8d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I65a05b9b91bd9960353cd665ff7d511c8e5f7db4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-04 04:30:51 +00:00
Tsung-Mao Fang
8ab6eb1be3 [automerger skipped] [DO NOT MERGE] FRP bypass defense in the settings app am: b34ff2f272 -s ours am: c923d29c08 -s ours am: e57ce41bf1 -s ours am: d9b063c4a8 -s ours am: 8c9e74c6c1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idfdb6511df114a8f1677a61adf4214d80dff13ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-04 04:30:41 +00:00
Tsung-Mao Fang
df12803b4f [automerger skipped] FRP bypass defense in the settings app am: 22869d9019 -s ours am: 9764e1f9fd -s ours am: 0f05806ab5 -s ours am: 5fd32e90b6 -s ours am: 5623c07822 -s ours am: 32fb9f64c1 -s ours
am skip reason: Merged-In Ia18f367109df5af7da0a5acad7702898a459d32e with SHA-1 1cf31d17aa is already in history

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

Change-Id: I6becad29e87907ad79594f8e0700724842279eb2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-04 04:30:41 +00:00
Arc Wang
88ed394a89 [automerger skipped] Merge "FRP bypass defense in the settings app" into sc-v2-dev am: 9a6c84c47e -s ours am: eeafd49d4e -s ours am: ecf1846617 -s ours am: 999bc0b0d0 -s ours am: f035fc4554 -s ours
am skip reason: Merged-In Ia18f367109df5af7da0a5acad7702898a459d32e with SHA-1 07dd833a6a is already in history

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

Change-Id: Ia97177c5f42fbb9ba72fe3ee2d4659545b46c242
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-04 04:30:30 +00:00
Tsung-Mao Fang
453c3d0deb [automerger skipped] FRP bypass defense in the settings app am: 1cf31d17aa -s ours am: b8fd889067 -s ours am: 38ee0a345a -s ours am: 4423f3e0b6 -s ours am: d136453d40 -s ours
am skip reason: Merged-In Ia18f367109df5af7da0a5acad7702898a459d32e with SHA-1 07dd833a6a is already in history

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

Change-Id: If344a958e09eefb17e86e67a3eb41de6c73a97e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-04 04:30:28 +00:00
Arc Wang
4fd3532821 [automerger skipped] Merge changes from topic "presubmit-am-8c4ee5d0c6b544bab2b8403178df17cc-sc-qpr1-dev-sc-dev" into sc-qpr1-dev am: 4b12201ec4 -s ours am: 57643513e3 -s ours am: 8cf511b709 -s ours am: 9ab2f7b65b -s ours am: 1e2d9162c2 -s ours
am skip reason: Merged-In Ia18f367109df5af7da0a5acad7702898a459d32e with SHA-1 22869d9019 is already in history

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

Change-Id: I1c0fb2d69e1a93dc66819c48187c3556a390693c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-04 03:56:49 +00:00
Tsung-Mao Fang
be972c495d [automerger skipped] [automerge] FRP bypass defense in the settings app 2p: 71f2d83688 am: 1ebb665b71 -s ours am: fc17db496f -s ours am: ee39631cdb -s ours am: f70458cdd9 -s ours am: 84a63ef6ce -s ours
am skip reason: Merged-In Ia18f367109df5af7da0a5acad7702898a459d32e with SHA-1 22869d9019 is already in history

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

Change-Id: I1ae9b4782c717b6d66b30e79b00f1e17f8b1d0a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-04 03:56:46 +00:00