Commit Graph

142371 Commits

Author SHA1 Message Date
Angela Wang
e92627e26d Merge "Rename CachedBluetoothDevice.getConnectableProfiles()" into main 2024-08-07 09:52:32 +00:00
Treehugger Robot
14c4f4bb67 [automerger skipped] Merge "Add missing required permissions for Settings" into main am: eb79f88253 -s ours am: 12c60990a6 -s ours
am skip reason: Merged-In I88038a5858e9a969ca8e3df6bc4e4e33d753f1e8 with SHA-1 3fe5e5f843 is already in history

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

Change-Id: Ifc392f227a23f1a1324dadef3253f4f7d79ec190
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-07 09:00:49 +00:00
yomna
6d11274dec [automerger skipped] Add missing required permissions for Settings am: a23b057db2 -s ours am: 12eb946b55 -s ours
am skip reason: Merged-In I88038a5858e9a969ca8e3df6bc4e4e33d753f1e8 with SHA-1 3fe5e5f843 is already in history

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

Change-Id: I0028c2af9fabf8707ce445a446fd73bbcafe1904
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-07 09:00:45 +00:00
Yiyi Shen
81539522d4 Merge "[Audiosharing] Handle device volume when volume bar is changed without touch" into main 2024-08-07 08:56:45 +00:00
Treehugger Robot
12c60990a6 [automerger skipped] Merge "Add missing required permissions for Settings" into main am: eb79f88253 -s ours
am skip reason: Merged-In I88038a5858e9a969ca8e3df6bc4e4e33d753f1e8 with SHA-1 3fe5e5f843 is already in history

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

Change-Id: I2467eef95775cda018558a951233431e45487f59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-07 08:45:34 +00:00
yomna
12eb946b55 [automerger skipped] Add missing required permissions for Settings am: a23b057db2 -s ours
am skip reason: Merged-In I88038a5858e9a969ca8e3df6bc4e4e33d753f1e8 with SHA-1 3fe5e5f843 is already in history

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

Change-Id: Ie56ecc6d5230876d92913b648540d52d0167e4bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-07 08:45:29 +00:00
Treehugger Robot
eb79f88253 Merge "Add missing required permissions for Settings" into main 2024-08-07 08:25:55 +00:00
yomna
a23b057db2 Add missing required permissions for Settings
SettingsSpaUnitTests BackgroundInstalledAppsPageProviderTest#title_displayed is failing due to
missing permissions GET_BACKGROUND_INSTALLED_PACKAGES, which is required for the test.

Fix: 357970545
Test: m & atest SubscriptionInfoListViewModelTest SettingsSpaUnitTests
Change-Id: I88038a5858e9a969ca8e3df6bc4e4e33d753f1e8
Merged-In: I88038a5858e9a969ca8e3df6bc4e4e33d753f1e8
2024-08-07 07:53:01 +00:00
Yiyi Shen
adbdc16113 [Audiosharing] Handle device volume when volume bar is changed without touch
Fix volume control when user use talk back swipe up/down or use Switch
Access to change the volume bar progress

Fix: 357028436
Fix: 357028435
Test: atest
Flag: com.android.settingslib.flags.enable_le_audio_sharing
Change-Id: Iab7d48ab8713a3a809cc8f7b28381a2b86b9be5f
2024-08-07 15:17:18 +08:00
Angela Wang
73fd3c1e3f Merge "Update UI for Flash notifications" into main 2024-08-07 07:11:40 +00:00
Treehugger Robot
06118ac027 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future am: 550a4253ed -s ours
am skip reason: contains skip directive

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

Change-Id: I4761abb619d7b26f42a349de77829717bc8ee7f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-07 06:57:43 +00:00
Bill Yi
b44dc39e1a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 97b9986d5c -s ours
am skip reason: contains skip directive

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

Change-Id: I217c0a4cf2cbacd09991ea59f879363e87124225
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-07 06:57:25 +00:00
Treehugger Robot
2e8218f0f0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future am: e5d3e4b6f1 -s ours
am skip reason: contains skip directive

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

Change-Id: Ia9dd1399c9b4c1e10eb894f2173762cf1adceacb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-07 06:57:21 +00:00
Bill Yi
857c339ff0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6c0c6b61c0 -s ours
am skip reason: contains skip directive

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

Change-Id: I97bb4862082bc49d13a5e516312734838b749e79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-07 06:57:14 +00:00
Bill Yi
8cbad5329b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 734f9c13ec -s ours
am skip reason: contains skip directive

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

Change-Id: I9e52117bb5c39580ab384c6ab08ca561ba382b0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-07 06:57:05 +00:00
Treehugger Robot
550a4253ed Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future 2024-08-07 06:31:13 +00:00
Treehugger Robot
e5d3e4b6f1 Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future 2024-08-07 06:31:13 +00:00
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
Bill Yi
734f9c13ec Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Iadb5679a0adf0967e9bca8bb205376f06fc46d3b
2024-08-06 17:11:21 -07:00
Bill Yi
97b9986d5c Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ie79f4a00fd2faa6f1f8131691c10e3d46456424b
2024-08-06 17:09:33 -07:00
Bill Yi
6c0c6b61c0 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ieaf59078e8adaae4d3a03fe0ae3f47ec4e2e913a
2024-08-06 17:08:00 -07: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