Xin Li
20b994799b
[automerger skipped] Merge 24Q3 (ab/AP3A.240905.015) to aosp-main-future am: 0b886fe303 -s ours
...
am skip reason: Merged-In I54a12b03ed9be6dc49fb957df0f1f7b31647810d with SHA-1 da21128568 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28804237
Change-Id: I47f62c1394d87a8af4d11dcfb34a704c27028c52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-15 18:23:59 +00:00
Treehugger Robot
ea813ef565
Merge "Prevent restricted users from being made admins" into main
2024-08-15 16:59:58 +00:00
Tetiana Meronyk
c8c5ac7be1
Merge "Read new value of admin status on UserCapabilities update" into main
2024-08-15 15:10:46 +00:00
Alexander Roederer
84cb2f6a02
Merge "Adds Zen metrics categories" into main
2024-08-15 14:39:45 +00:00
Tetiana Meronyk
53058c197c
Prevent restricted users from being made admins
...
Bug: 357704332
Test: manual
Flag: EXEMPT bug_fix
Restricted
Change-Id: I45b31616829134a61bfa587302c5165da192dc8a
2024-08-15 13:10:32 +00:00
Haijie Hong
04f1fea990
Merge "Implement Spatial audio toggle domain layer" into main
2024-08-15 10:54:48 +00:00
Haijie Hong
e3702e9b14
Merge "Rearrange bluetooth device details fragment according to config" into main
2024-08-15 08:13:11 +00:00
Xin Li
0b886fe303
Merge 24Q3 (ab/AP3A.240905.015) to aosp-main-future
...
Bug: 347831320
Merged-In: I54a12b03ed9be6dc49fb957df0f1f7b31647810d
Change-Id: I473577d5983daafb368afa5523bad948499cb9a2
2024-08-14 23:26:30 -07:00
Treehugger Robot
b9972035bb
Merge "Avoid launching details settings after WifiEntry is forgotten" into main
2024-08-15 05:44:24 +00:00
Weng Su
a6861564b5
Avoid launching details settings after WifiEntry is forgotten
...
- Don't launch details settings if WifiEntry isn't saved
Bug: 359584817
Flag: EXEMPT bugfix
Test: Manual testing
atest -c NetworkProviderSettingsTest
Change-Id: Iff1c37b64adef6d136d2aaa6a0a946c22af38193
2024-08-15 12:06:11 +08:00
Zoey Chen
22c4a1e955
Merge "[Settings] Do not create fragment twice" into main
2024-08-15 02:27:14 +00:00
Zoey Chen
6bab5112c4
Merge "[Settings] Should create header again when adding it to the listview" into main
2024-08-15 02:26:58 +00:00
Treehugger Robot
d3fc95aa14
Merge "Update icon picker options, sort order, and descriptions" into main
2024-08-15 01:40:07 +00:00
Treehugger Robot
b3d4b76c69
Merge "Add mandatory biometric prompt to platform surfaces (5/N)" into main
2024-08-15 01:11:42 +00:00
Alexander Roederer
64593a873a
Adds Zen metrics categories
...
Assigns metrics categories to all modes pages under
ZenModesListFragment. Includes new metrics categories where appropriate.
Bug: 332937635
Test: Build and flash
Flag: android.app.modes_ui
Change-Id: Ic19862ec194b40eae294d3c30240fe3f51304665
2024-08-14 20:27:13 +00:00
Matías Hernández
e1dbcfcdb8
Update icon picker options, sort order, and descriptions
...
Final icon list is ready!
Bug: 359171199
Test: atest IconOptionsProviderImplTest + manual
Flag: android.app.modes_ui
Change-Id: Ia46558fa320bbcc44d19fdda81b14773851a6060
2024-08-14 18:18:19 +00:00
Matías Hernández
1dfc18740e
Don't read the +N test of CircularIconsPreference
...
The description of the segment is already "App 1, App 2, and x more can interrupt", from its text. If the icons don't fit, there's a "+N" at the end. Accessibility services reading this is confusing, especially because the icons that don't fit are not the same as the names that don't fit, so you could get something like "App 1, App 2, and 9 more can interrupt, plus 4".
The whole circular-icons section is irrelevant for a11y so we just mark the container as "noHideDescendants" to save Talkback some work.
Fixes: 359837977
Test: Manual with Talkback
Flag: android.app.modes_ui
Change-Id: I346abcc94e25ef60c5e91f77b8e13f38ade39c71
2024-08-14 17:09:46 +00:00
Tetiana Meronyk
56446fa3b8
Read new value of admin status on UserCapabilities update
...
Before multiple admins were introduced, only main user could be an admin and that status was not modifiable. But now it can be updated for non-main admins of the device. So it is important to refresh this value to keep it up to date.
Bug: 359466920
Test: atest UserCapabilitiesTest
Flag: EXEMPT bugfix_only
Change-Id: If39ad24b10daf6886f402926b3bab23b50201c98
2024-08-14 15:44:35 +00:00
Treehugger Robot
afa281ce5b
Merge "Get available channels allowed by Hotspot" into main
2024-08-14 15:03:56 +00:00
Haijie Hong
df2915bd4e
Merge "Add owners for bluetooth settings test folder" into main am: 55834fff02 am: 61a2efc807
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3216259
Change-Id: Idd4a63bea7da0801e963d605d17b751643d1a9d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-14 10:48:35 +00:00
Haijie Hong
61a2efc807
Merge "Add owners for bluetooth settings test folder" into main am: 55834fff02
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3216259
Change-Id: I4835d1b33e1593892054224dec33ea79e64187dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-14 10:32:20 +00:00
Haijie Hong
55834fff02
Merge "Add owners for bluetooth settings test folder" into main
2024-08-14 09:56:42 +00:00
Haijie Hong
6f38de4932
Add owners for bluetooth settings test folder
...
Change-Id: I1503db974eb271890486581d173c1bde8457f7df
2024-08-14 09:42:21 +00:00
Haijie Hong
c1b24f0a9e
Implement Spatial audio toggle domain layer
...
BUG: 343317785
Test: atest SpatialAudioInteractorTest
Flag: com.android.settings.flags.enable_bluetooth_device_details_polish
Change-Id: Ic73e56a1ca41f9fa58d5219666478a7edc55059d
2024-08-14 17:23:14 +08:00
Matías Hernández
db50368328
Merge "Animate the color transition (active<->inactive) in the mode header icon" into main
2024-08-14 09:11:04 +00:00
Weng Su
6c2158edef
Get available channels allowed by Hotspot
...
- Use getAllowedChannels API instead of getUsableChannels API to avoid corner cases
Bug: 352267181
Flag: EXEMPT bugfix
Test: Manual testing
atest -c WifiHotspotRepositoryTest
Change-Id: I5ae4a4d429924ac2b8676bbbb27016a93ccd9a1b
2024-08-14 17:10:05 +08:00
Haijie Hong
41f7c222b6
Rearrange bluetooth device details fragment according to config
...
BUG: 343317785
Test: atest DeviceDetailsFragmentFormatterTest
Flag: com.android.settings.flags.enable_bluetooth_device_details_polish
Change-Id: I440f85b2c402920e851915ff56fa7b3f5356e807
2024-08-14 16:06:15 +08:00
Zoey Chen
291e496075
[Settings] Should create header again when adding it to the listview
...
Bug: 291545021
Test: manual
Flag: EXEMPT bugfix
Change-Id: I9d76814d98b67b1eb0078765a2b5bd6949cff446
2024-08-14 03:53:21 +00:00
Shaowei Shen
a2c65ecec4
Merge "[Physical Keyboard] Add flag for keyboard a11y new page features" into main
2024-08-14 02:26:13 +00:00
Yuri Lin
21ef302524
Merge "Add images for interstitial pages." into main
2024-08-13 22:25:40 +00:00
Yuri Lin
24ba675fe4
Add images for interstitial pages.
...
This change removes the custom rounding of corners, as the provided images already have rounded corners.
Bug: 332730534
Test: manual (light & dark mode, various font/display sizes)
Flag: android.app.modes_ui
Change-Id: I71d0707554e5bc638add6a2907874e18e833da08
2024-08-13 16:46:05 -04:00
Chun-Ku Lin
1c5bd6f935
Merge "Revert "Revert "Don't truncate the title in Color Correction opt..."" into main
2024-08-13 20:18:33 +00:00
Treehugger Robot
4b08b87c3b
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-08-13 19:25:13 +00:00
Treehugger Robot
062e872b16
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 03a0b2b86f -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28774378
Change-Id: Id8c1e5a47cecfd48cd5e33139fef525fc91dee74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-13 19:10:35 +00:00
Bill Yi
7b3b9448e2
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e7f3fc3ff7 -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28774378
Change-Id: Ia6a5d83e2f6c6c40e79f158daa2931787225cb8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-13 19:10:19 +00:00
Treehugger Robot
b4e4b96eb7
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 114eeeb6e1 -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28774376
Change-Id: I227d497231e16f8c7bdb574e11af90b30c87611d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-13 19:10:15 +00:00
Bill Yi
df5002f74a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 63806ab38d -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28774376
Change-Id: Ifcc963309c9beb77a56fa15480ed3ba45a90f82d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-13 19:10:08 +00:00
Bill Yi
b0c6ec9933
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fdc1c4f73e -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28773865
Change-Id: I15f1b7f850e140b89cb3062303f2e90c7bfc0c4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-13 19:09:55 +00:00
Treehugger Robot
03a0b2b86f
Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev
2024-08-13 18:51:39 +00:00
Treehugger Robot
114eeeb6e1
Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev
2024-08-13 18:51:39 +00:00
Treehugger Robot
cae253dd47
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-08-13 18:26:07 +00:00
Treehugger Robot
d35ad44cd2
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod am: 5b58909131 -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28773863
Change-Id: I7bbc85efd79fa072c7da61b9a3c901739a572869
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-13 18:03:36 +00:00
Bill Yi
a7801c0fa3
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 556af55a3a -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28773863
Change-Id: I58dbb48c237702a58fa3041b8c748708e07e71ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-13 18:03:18 +00:00
Treehugger Robot
f818b18927
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-08-13 17:59:59 +00:00
Bill Yi
57c68f531d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 628f7acb6a -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28773862
Change-Id: Ie133db2789a59f98e451e593aed3675c57b50ddd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-13 17:59:14 +00:00
Treehugger Robot
5b58909131
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod
2024-08-13 17:39:32 +00:00
Treehugger Robot
d91aed9009
Merge "[dev_option] Dismiss reboot dialog on screen rotation." into main
2024-08-13 17:26:14 +00:00
Matías Hernández
115d29e851
Animate the color transition (active<->inactive) in the mode header icon
...
Also, don't apply the layout params, etc on each call to updateState - once per displayPreference is enough.
Fixes: 356399449
Bug: 357861830
Test: manual
Flag: android.app.modes_ui
Change-Id: I6967ea1745377d0f514ca0f68101043f017a8fd7
2024-08-13 19:23:17 +02:00
Vaibhav Devmurari
5cbcfb07fe
Merge "Fix: User main user for personal profile" into main
2024-08-13 11:17:23 +00:00
Zoey Chen
b0f51ff8fb
[Settings] Do not create fragment twice
...
Bug: 353141266
Test: manual
Flag: EXEMPT bugfix
Change-Id: Id300fa4ae7b6edc7663da2efe6bd5ce5401d4947
2024-08-13 11:17:18 +00:00