Commit Graph

46458 Commits

Author SHA1 Message Date
Becca Hughes
f31920a613 Merge "Fix bug in credential manager settings (dialogs)" 2023-01-05 18:20:55 +00:00
Vania Januar
c3f6c0d593 Merge "Replace placeholder ROLE_ASSISTANT with ROLE_NOTES." 2023-01-05 14:49:31 +00:00
Tetiana Meronyk
c0e31b3be1 Merge "Allow creating admin users when 'config_enableMultipleAdmins' property is enabled" 2023-01-05 14:30:34 +00:00
Chaohui Wang
4525cfb462 Merge "Remove EXTRA_USER_HANDLE from startSpaActivityForApp" 2023-01-05 11:06:08 +00:00
Chaohui Wang
875cbba0af Merge "Add spinner options to "All apps"" 2023-01-05 11:05:23 +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
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
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
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
Tom Hsu
8d13ea9e64 Merge "[Regional Preference] Create each page for regional preferences" 2023-01-05 05:34: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
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
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
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
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
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
TreeHugger Robot
7dfe918785 Merge "Launch settings for clicking fingerprint unlock" 2023-01-04 05:55:54 +00:00
Yilin Cai
fa93f941ef Fork the Wi-Fi control setting page to SPA.
The page is located at "Apps > Special app access > Wi-Fi control".

Test: atest SettingsSpaUnitTests:com.android.settings.spa.app.specialaccess.WifiControlAppListModelTest
Test: local device (http://screen/3a4mkuAwPJoY6rf, http://screen/4fzttXjBqcEKcXA)
Bug: 262206181
Change-Id: Ibef029e6d83849a0eb0d779e5ed6dedfc2fe4b43
2023-01-04 10:56:44 +08:00
Yasin Kilicdere
541a984ce0 Merge "Remove the fallback AddSupervisedUserActivity." into tm-dev am: 15a89a60ac am: 2ecf96a422 am: 85379e9452
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20665167

Change-Id: I64b7be5d06cc021d992ed2ca1d84305669234fca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-03 23:03:32 +00:00
Yasin Kilicdere
85379e9452 Merge "Remove the fallback AddSupervisedUserActivity." into tm-dev am: 15a89a60ac am: 2ecf96a422
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20665167

Change-Id: I6474b049eea96fa6b51692a71ea7a2433cdfb620
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-03 13:25:59 +00:00
Yasin Kilicdere
2ecf96a422 Merge "Remove the fallback AddSupervisedUserActivity." into tm-dev am: 15a89a60ac
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20665167

Change-Id: I2c91cb0334d6151759f925ea84286c9af619f897
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-03 12:53:48 +00:00
Yasin Kilicdere
15a89a60ac Merge "Remove the fallback AddSupervisedUserActivity." into tm-dev 2023-01-03 12:18:58 +00:00
Shen Lin
bdcfaceeb2 Fix NPE in BluetoothPairingController when comparing BluetoothClass
Bug: 264162859
Test: atest BluetoothPairingControllerTest
Change-Id: I7e3c913855d77983f4f8bc61f5b08f64fe9fae4d
2023-01-03 06:33:51 +00:00
Chaohui Wang
7430578af1 Merge "Add SpaAppBridgeActivity for application usage" 2023-01-03 03:06:18 +00:00
Betty Chang
a50fb6ec33 Merge "To check the bond state when get the connection state" 2023-01-03 02:20:03 +00:00
TreeHugger Robot
2451afc0df Merge "Refine TetherSettings to avoid activity leaks" 2022-12-30 16:41:19 +00:00
Vania Januar
3dcceea28f Merge "Set title for Bluetooth Details page to "Stylus" for styluses." 2022-12-30 09:32:43 +00:00
TreeHugger Robot
e37f265f31 Merge "Remove unused logic" 2022-12-30 05:21:01 +00:00
Tom Hsu
94cd62ff00 Merge "[Regional Preference] Add each option entry" 2022-12-30 03:20:13 +00:00
XingHai Lu
df1fc7e0fa Merge "Cleanup plurals format Change <one> to <1> in string res file Test: Update, existing tests still pass bug: 199230342" 2022-12-30 02:44:25 +00:00
Milton Wu
160661dc6d Launch settings for clicking fingerprint unlock
Launch FingerprintSettings directly when user clicks "Fingerprint
Unlock". Let Fingerprint settings peform confirmLock() or chooseLock().
And to have smoothly animation, instead of generating challenge in
FingerprintSettings::onActivityResult(), challenge is generated in next
visible activity, and pass it back through next activity result.

Bug: 197717071
Test: atest GatekeeperPasswordProviderTest CredentialModelTest
Test: atest AutoCredentialViewModelTest FingerprintStatusUtilsTest
Test: RunSettingsRoboTests2 FingerprintEnrollIntroductionTest
Test: Manually test fingerprint enroll in settings or suw
Change-Id: Ie27c3c493ea475f6b53cb6bb3f2d45d555f47cb3
2022-12-30 10:01:06 +08:00
TreeHugger Robot
ca0ff60d63 Merge "Fix the end-icon missing issue for Wi-Fi networks" 2022-12-30 01:29:29 +00:00