Commit Graph

142349 Commits

Author SHA1 Message Date
Allen Su
ee4f6af308 Merge "Explain region selection" into main 2024-08-07 06:29:16 +00:00
Chelsea Hao
5473fa04f5 Merge "[Audiosharing] When landscape mode, collapse app bar to make more space. Also refined fragments and make them scrollable." into main 2024-08-07 05:07:00 +00:00
Treehugger Robot
87778221d3 Merge "Fix the charging string while charging wirelessly" into main 2024-08-07 03:55:07 +00:00
Allen Su
bc06ecf62c Explain region selection
Flag: EXEMPT resource only update
Bug: 353382794
Test: manual
Change-Id: Ief06a9aaee833f9dc0680c622b70b69130bd5653
2024-08-07 03:21:59 +00:00
Chaohui Wang
e2f0a6b2d3 Fix the sorting order for restricted
Set the category for the restricted item to fix.

Fix: 357275199
Flag: EXEMPT bug fix
Test: manual - on DataUsageList
Test: atest AppDataUsageRepositoryTest
Change-Id: I63d3fd2ac85748d67ff6194cd60adeadae2aa984
2024-08-07 02:23:23 +00:00
Matías Hernández
377939483c Merge "Skip updating mode list entries for unchanged modes" into main 2024-08-07 00:18:34 +00:00
Priyanka Advani (xWF)
605c160a49 Merge "Revert "Don't truncate the title in Color Correction options"" into main 2024-08-06 21:19:51 +00:00
Priyanka Advani (xWF)
74e3432b8c Revert "Don't truncate the title in Color Correction options"
Revert submission 28616239-356726764-dont-truncate-color-correction-options

Reason for revert: Droidmonitor created revert due to b/357907390. Will be verifying through ABTD before submission.

Reverted changes: /q/submissionid:28616239-356726764-dont-truncate-color-correction-options

Change-Id: Icb911cc954a046084dd198c61c2e6c4080145801
2024-08-06 19:57:02 +00:00
Yuri Lin
eb6dd8432b Merge changes from topic "yl-interstitial" into main
* changes:
  Resize & round corners on a placeholder interstitial image
  Add interstitial for modes that are disabled but not by user
2024-08-06 19:38:45 +00:00
Chun-Ku Lin
b1f8213735 Merge "Don't truncate the title in Color Correction options" into main 2024-08-06 16:55:39 +00:00
Matías Hernández
6737cbf68a Skip updating mode list entries for unchanged modes
Bug: 357861830
Test: manual, with debugger
Flag: android.app.modes_ui
Change-Id: Ieaea5053d1e8e3bc4052af1f961470eb8211192f
2024-08-06 18:39:21 +02:00
Ming-Shin Lu
55102216e1 Merge "Delete keyboard_category_enabled flag (2/2)" into main 2024-08-06 11:38:41 +00:00
Yiling Chuang
9e2bda0c87 Fix the charging string while charging wirelessly
Move the null check of the charging remaining time after the wireless charging check, so when the time to full is not available, there's still a chance to show the customized wireless charging state.

Fixes: 342046505
Test: atest SettingsRoboTests
Flag: EXEMPT bugfix
Change-Id: I8a6104c46222e9f27d488035a218856f51e30430
2024-08-06 10:56:07 +00:00
Angela Wang
3146a9a08a Merge "Fix LE Audio toggle missing issue for dual mode hearing device" into main 2024-08-06 09:31:28 +00:00
Nikhil Kumar
bf420bbe7c Merge "Restrict admin status change when DISALLOW_GRANT_ADMIN is present" into main 2024-08-06 09:21:11 +00:00
chelseahao
e7a1762ef3 [Audiosharing] When landscape mode, collapse app bar to make more space. Also refined fragments and make them scrollable.
Bug: b/356302527, b/356300387, b/356297148
Flag: com.android.settingslib.flags.enable_le_audio_qr_code_private_broadcast_sharing
Test: atest
Change-Id: I5d94f0d05afc78c13cab5b75ad662af72ffa0350
2024-08-06 09:09:11 +00:00
Chaohui Wang
d66e3de46d Merge "Settings search for W-Fi calling" into main 2024-08-06 08:32:18 +00:00
Chaohui Wang
8140e7f2b6 Merge "Speed up BasePreferenceController.updateNonIndexableKeys" into main 2024-08-06 03:13:17 +00:00
Daniel Norman
2a8c60ff6f Merge "Never restricts Accessibility Activities based on ECM/admin." into main 2024-08-05 22:59:40 +00:00
Treehugger Robot
6b6b9c10ff Merge "Restrict MobileDataSlice" into main 2024-08-05 21:25:59 +00:00
Weng Su
75a070f3f0 Restrict MobileDataSlice
- Hide MobileDataSlice if the user is not allowed to configure mobile networks.

Bug: 310630794
Flag: EXEMPT bugfix
Test: manual test
atest -c MobileDataSliceTest

Change-Id: I35814733a915f011e284b082ce7a94898ce8a6fb
2024-08-06 04:14:12 +08:00
Nikhil Kumar
01b7062b34 Restrict admin status change when DISALLOW_GRANT_ADMIN is present
This change addresses a security gap where users with the "DISALLOW_GRANT_ADMIN" restriction could still grant admin privileges to others, potentially undermining supervised user models.  We've extended the existing logic to ensure that restricted users cannot grant or receive admin privileges when the DISALLOW_GRANT_ADMIN restriction is in place. This prevents scenarios where supervised users could create new admins to bypass restrictions and factory reset the device.

In addition to the core functionality improvement, significant code refactoring has been done to untangle complex multiple if conditions. The logic for determining when admin status changes are allowed is now clearer and more readable, taking into account both the "current user" (initiating the change) and the "target user" (whose privileges are being modified).

Bug: 357056776
Test: atest UserDetailsSettingsTest and manually verified the user having DISALLOW_GRANT_ADMIN restriction is not allowed to change admin status of any other user.
Flag: android.multiuser.unicorn_mode_refactoring_for_hsum_read_only
Change-Id: If02c9355ee7ce285b5b7bcddae630d716d5bf333
2024-08-05 18:16:33 +00:00
Allen Su
b22a9d03af Merge "Revert^2 "Expand ToA language support"" into main 2024-08-05 16:55:21 +00:00
Jason Chang
34adbf0bb5 Merge "Fix the option to set a different screen lock in the "Set a PIN" screen is displayed off the screen when the device language is set to Arabic" into main 2024-08-05 16:47:06 +00:00
Allen Su
6b6ab63918 Revert^2 "Expand ToA language support"
This reverts commit 773afdfaf7.

Reason for revert: b/357055415 has been fixed. Revert is unnecessary

Flag: TEST_ONLY
Bug: 328697623
Test: atest TermsOfAddressCategoryControllerTest
Change-Id: Ic1477e3dfdade68b81bbdcdb0c98109064278eb4
2024-08-05 15:10:17 +00:00
Ming-Shin Lu
bc79a1e074 Delete keyboard_category_enabled flag (2/2)
As keyboard_category_enabled feature has launched, remove the feature
flag since it's unnessary.

And, this CL is the preparation of removing CATEGORY_KEYBOARD vibration
attribute and logic, remove the flag usage ing settings since no longer
need this flag.

Flag: EXEMPT flag removal
Bug: 332661766
Test: build
Test: atest KeyboardVibrationTogglePreferenceControllerTest
Change-Id: I19cecb977d52a74b26eea1f494052e0e852359c4
2024-08-05 14:06:24 +00:00
Joseph Vincent
7038ee8d24 Merge "Show different error screen for PS creation based on error" into main 2024-08-05 13:21:29 +00:00
Pechetty Sravani (xWF)
b50b1fc439 Merge "Revert "Expand ToA language support"" into main 2024-08-05 11:53:42 +00:00
Priyanka Advani (xWF)
773afdfaf7 Revert "Expand ToA language support"
This reverts commit a60a38dd39.

Reason for revert: Droidmonitor created revert due to b/357174479.

Change-Id: I2db3afbb148bf7a9d66d395c56e490d837cb8b93
2024-08-05 11:41:10 +00:00
Chaohui Wang
103e90636f Settings search for W-Fi calling
Fix: 299641035
Flag: EXEMPT bug fix
Test: manual - search wifi calling
Test: atest WifiCallingPreferenceControllerTest
Change-Id: I230531000d7fe01f3295cf2dd7ced698e5346a0b
2024-08-05 17:33:48 +08:00
Jason Chang
58bc2e3dca Fix the option to set a different screen lock in the "Set a PIN"
screen is displayed off the screen when the device language is set
to Arabic

To call optButton's MarginLayoutParams setMarginStart() instead of
set leftMargin.

Flag: EXEMPT bugfix

Bug: 355422248

Test: build Forrest ROM and verify the UI
Change-Id: I700b83937ecd8509864fa3c80826de0ba0437ca2
2024-08-05 08:55:10 +00:00
chelseahao
b377b1c0e4 [Audiosharing] Increase click target.
Bug: 357012346
Flag: com.android.settingslib.flags.enable_le_audio_qr_code_private_broadcast_sharing
Test: atest
Change-Id: I2ecaf4d3c8c2b249da4b25b6658f1aef3c43209e
2024-08-05 07:15:45 +00:00
Haijie Hong
094e040213 Merge "Remove duplicate "lifecycle.addObserver(this)"" into main 2024-08-05 06:58:35 +00:00
Chaohui Wang
e0f10543c5 Merge "Settings search for Roaming" into main 2024-08-05 06:54:41 +00:00
Yiyi Shen
b068edadf1 Merge "[Audiosharing] Returns BluetoothDevice when fetchConnectedDevicesByGroupId" into main 2024-08-05 06:11:47 +00:00
Haijie Hong
8e7b62c887 Remove duplicate "lifecycle.addObserver(this)"
It's already been added in superclass BluetoothDetailsController.

BUG: 343317785
FLAG: EXEMPT simple fix
Test: atest BluetoothDetailsProfilesControllerTest
Test: atest BluetoothDetailsPairOtherControllerTest
Change-Id: I7a9255cea5bb18b29562fa72898356c7a01cd31c
2024-08-05 13:38:00 +08:00
Chaohui Wang
b9db3c5395 Settings search for Roaming
Fix: 351740003
Flag: EXEMPT bug fix
Test: manual - search roaming
Change-Id: I260449bdea7dcaae6a2d44c6810cf2638c18d9a4
2024-08-05 12:58:51 +08:00
Treehugger Robot
793253aaf2 Merge "Reduce flaky of BackgroundInstalledAppsPageProviderTest" into main 2024-08-05 03:11:39 +00:00
Chaohui Wang
210529efc4 Reduce flaky of BackgroundInstalledAppsPageProviderTest
Bug: 355413226
Flag: EXEMPT test only
Test: atest BackgroundInstalledAppsPageProviderTest
Change-Id: Iede656b7cf34bac82718f0aff12ee28cbaa9d8f8
2024-08-05 10:23:02 +08:00
Chaohui Wang
45aa574b9b Merge "Show uncheck toggle when wep not supported" into main 2024-08-05 02:02:20 +00:00
Allen Su
bf0b93b104 [ToA] Fix unit test failure
Flag: TEST_ONLY
Bug: 328697623
Test: atest TermsOfAddressCategoryControllerTest
Change-Id: Iddbf5b1ca16e455dfa12b9a9a6543d366b62d55e
2024-08-04 17:01:26 +00:00
Treehugger Robot
9ad4ecfad6 Merge "Replace direct usage of update origin by TestModeBuilder.setEnabled() overload" into main 2024-08-03 18:22:25 +00:00
Treehugger Robot
d92dc8f9f3 [automerger skipped] Merge "RESTRICT AUTOMERGE FRP bypass defense in App battery usage page" into tm-qpr-dev am: 0864404279 -s ours am: 59276afaf6 -s ours am: 49709fc079 -s ours am: 20002f05cb -s ours
am skip reason: contains skip directive

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

Change-Id: Ie4ba665fa19666149d8454b8afbc3191653653bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-03 03:46:28 +00:00
Yiling Chuang
8b960a9425 [automerger skipped] RESTRICT AUTOMERGE FRP bypass defense in App battery usage page am: 0e903bfe7f -s ours am: 8a7b910ba9 -s ours am: 15cc3710ae -s ours am: ab8549ec77 -s ours
am skip reason: contains skip directive

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

Change-Id: Id164055876f5dd7b6c89b6c1bf2988393c935d63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-03 03:46:22 +00:00
Treehugger Robot
20002f05cb [automerger skipped] Merge "RESTRICT AUTOMERGE FRP bypass defense in App battery usage page" into tm-qpr-dev am: 0864404279 -s ours am: 59276afaf6 -s ours am: 49709fc079 -s ours
am skip reason: contains skip directive

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

Change-Id: I655c042f8ecbd8f6516b962b76f44ecda5908088
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-03 03:27:43 +00:00
Yiling Chuang
ab8549ec77 [automerger skipped] RESTRICT AUTOMERGE FRP bypass defense in App battery usage page am: 0e903bfe7f -s ours am: 8a7b910ba9 -s ours am: 15cc3710ae -s ours
am skip reason: contains skip directive

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

Change-Id: I784fceec0fbd1608588469254e8203cff757dbf7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-03 03:27:38 +00:00
Treehugger Robot
95526524a5 [automerger skipped] Merge "RESTRICT AUTOMERGE FRP bypass defense in App battery usage page" into tm-qpr-dev am: 0864404279 -s ours am: 59276afaf6 -s ours am: 7452a8c4d8 -s ours
am skip reason: contains skip directive

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

Change-Id: I10dca902ea17a6a76ebf4767b27c5c30899bc8ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-03 03:27:28 +00:00
Yiling Chuang
75bfcb6407 [automerger skipped] RESTRICT AUTOMERGE FRP bypass defense in App battery usage page am: 0e903bfe7f -s ours am: 8a7b910ba9 -s ours am: 88bdbd7ac3 -s ours
am skip reason: contains skip directive

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

Change-Id: I22a7a2603fd841bf24095064f0c7a9195b13f865
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-03 03:27:24 +00:00
Treehugger Robot
7452a8c4d8 [automerger skipped] Merge "RESTRICT AUTOMERGE FRP bypass defense in App battery usage page" into tm-qpr-dev am: 0864404279 -s ours am: 59276afaf6 -s ours
am skip reason: contains skip directive

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

Change-Id: Ic276da7c0a5c7ce0145a0bb5f35e0bb9e97dc0ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-03 03:08:04 +00:00
Yiling Chuang
88bdbd7ac3 [automerger skipped] RESTRICT AUTOMERGE FRP bypass defense in App battery usage page am: 0e903bfe7f -s ours am: 8a7b910ba9 -s ours
am skip reason: contains skip directive

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

Change-Id: I97145b7f99fc455305a74164b9895cfe7542d7ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-03 03:08:01 +00:00