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
faa8b24cc4
Fix text is not readable with black & white wallpaper issue
...
Flag: EXEMPT bugfix
Test: manually check the UI and attach the result in bug
Bug: 356065922
Change-Id: I955cd51823d2cac6deaca8280bc8572ed8518a8a
2024-08-07 07:13:18 +00:00
Angela Wang
73fd3c1e3f
Merge "Update UI for Flash notifications" into main
2024-08-07 07:11:40 +00:00
Kai Zhou
184bca9c16
Add unit test in WifiDppConfiguratorActivity
...
* Bug: b/349252886
* Settings Intake: b/329012096
Test: atest tests/unit/src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivityTest.java
Flag: com.android.settings.flags.enable_wifi_sharing_runtime_fragment
Change-Id: I951ed57acd40505c1ccecdb8420d197f7edd42f7
2024-08-07 07:10:20 +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
Chaohui Wang
aa0d63ce40
Check ims for isVoImsOptInEnabled
...
If the device does not have PackageManager.FEATURE_TELEPHONY_IMS,
ProvisioningManager.getProvisioningIntValue() could not be called.
Fix: 346708541
Flag: EXEMPT bug fix
Test: manual - SIM settings
Change-Id: I52b5a62d20ee7df14ecf93c9b0dbbed6f7dc0f0d
2024-08-07 11:45:28 +08: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
Chun-Ku Lin
661c02fbb8
Revert "Revert "Don't truncate the title in Color Correction opt..."
...
Revert submission 28661116-revert-28616239-356726764-dont-truncate-color-correction-options-LCBEOTEYHE
Reason for revert: Attempt to re-land b/356726764 with a fix to add `sdk_verion: system_current` to the SelectorWithWidgetPreference aconfig
Reverted changes: /q/submissionid:28661116-revert-28616239-356726764-dont-truncate-color-correction-options-LCBEOTEYHE
Change-Id: Ia9c5d9f4362f06bb5a317d12a4fb32e53f5993dd
2024-08-07 00:40:18 +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
Matías Hernández
f0952bef52
Update Priority Modes segment summary
...
* Display active modes regardless of DND status
* Only consider actually automatic rules for the "x rules can activate automatically" text.
* Also removed the duplicate settings observer in favor of ZenSettingsObserver.
Bug: 355615361
Test: atest ZenModesSummaryHelperTest
Flag: android.app.modes_ui
Change-Id: I39acb785e7b27c95ed664261640c42032acca9d1
2024-08-06 19:48:01 +02: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
Nikhil Kumar
c05f058083
SettingsApp Implement DISALLOW_GRANT_ADMIN in user creation flow
...
In the process of creating a user through the Settings app, if the current user has the DISALLOW_GRANT_ADMIN restriction, the dialogue for granting ADMIN privileges will be hidden after this implementation. This action ensures that even if child users can create SECONDARY users, they cannot create ADMIN users.
Design doc: go/unicorn-hsum
Bug: 357819541
Test: manually verified the user is not allowed to create ADMIN user when DISALLOW_GRANT_ADMIN restriction is applied.
Flag: android.multiuser.unicorn_mode_refactoring_for_hsum_read_only
Change-Id: I4b40f83b50d4de0af103d4f5ca400e42345144e0
2024-08-06 13:53:46 +00: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
Android Build Coastguard Worker
94ea022aa1
Merge cherrypicks of ['googleplex-android-review.googlesource.com/28600455', 'googleplex-android-review.googlesource.com/28600456', 'googleplex-android-review.googlesource.com/28600458'] into 24Q3-release.
...
Change-Id: I24e42a4830ce637feed658ee4114eb70adc6e0d2
2024-08-06 09:33:38 +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
Bill Yi
ca9227cb22
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Bug: 347053373
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:0bfc1bba0a2205b19121ccfa38b5e848908b4705 )
Merged-In: If3d00eec44ea2235c842a0069d7a9c1bf826494e
Change-Id: If3d00eec44ea2235c842a0069d7a9c1bf826494e
2024-08-06 09:22:08 +00:00
Bill Yi
360b4f5d93
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Bug: 347053373
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:e7dff9e44ae851aa389fc3d6264f42ddbba47eb9 )
Merged-In: I3e7d733c95f32a4896d5148e8be58973ae1ad61a
Change-Id: I3e7d733c95f32a4896d5148e8be58973ae1ad61a
2024-08-06 09:21:48 +00:00
Bill Yi
c9125eb9ec
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Bug: 347053373
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:b86bdbab43b4725c1df08dd3e0243743d9399e30 )
Merged-In: I2ffb0010fb53dd8cc60496bfec0c5644a5388200
Change-Id: I2ffb0010fb53dd8cc60496bfec0c5644a5388200
2024-08-06 09:21:34 +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