Treehugger Robot
fe44ea6c87
Merge "Add the new Desktop Experience dev options" into main
2025-01-24 16:27:43 -08:00
Pawan Wagh
192da620e6
Merge "Updating the notification ID " into main am: 9d451341a0
am: 8102d256b4
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3453239
Change-Id: I57a0fbc3fac166c9b6fa38ff0b888b6243145a81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-01-24 15:41:12 -08:00
Pawan Wagh
8102d256b4
Merge "Updating the notification ID " into main am: 9d451341a0
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3453239
Change-Id: Ia18d8a66806956ca6260672b77c56cb0900d7279
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-01-24 15:28:38 -08:00
Pawan Wagh
9d451341a0
Merge "Updating the notification ID " into main
2025-01-24 15:21:49 -08:00
Matthew DeVore
50cee5bf76
Merge "Show border highlight when dragging display" into main
2025-01-24 14:37:12 -08:00
Matthew DeVore
3a40af147e
Merge "Use correct Settings API to set mirror/extend" into main
2025-01-24 10:50:02 -08:00
Marzia Favaro
271fb3ea63
Merge "UserAspectRatioManager call AtivityRecord#canBeUniversalResizeable" into main
2025-01-24 02:46:03 -08:00
Justin Yun
1cf3f07163
[automerger skipped] Merge "Revert "Replace system_ext container with system"" into main am: faa8f0e399
am: badb14fdb1
-s ours
...
am skip reason: Merged-In I8f52d5f86e6ffaccd624846fbe1ba0a8fc842af6 with SHA-1 1337a88d11
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3463347
Change-Id: I7eb2d23e6c01d6b91a61319c16eebb194388eb08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-01-24 02:18:31 -08:00
Justin Yun
badb14fdb1
Merge "Revert "Replace system_ext container with system"" into main am: faa8f0e399
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3463347
Change-Id: I319bce0a062165a630c5ed391ad9305eaac511e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-01-24 02:05:44 -08:00
Justin Yun
faa8f0e399
Merge "Revert "Replace system_ext container with system"" into main
2025-01-24 01:49:56 -08:00
Justin Yun
207466d3c1
settings_connectivity_flags is used from system_ext app
...
As a system_ext app is using the flags, the flags must be in the
system_ext container instead of the system container.
Bug: 385213580
Test: "adb shell aflags list" must not be changed.
Flag: EXEMPT refactor
Change-Id: I46123b93909acc1e1b2e84ac4fe7898ed5243fc5
2025-01-24 16:23:38 +09:00
Justin Yun
e0c046c187
Revert "Replace system_ext container with system"
...
This reverts commit 6e1b274f03
.
A system partition cannot have the aconfigs of other partitions.
Revive the system_ext container for system_ext aconfigs.
Bug: 385213580
Test: "adb shell aflags list" must not be changed.
Flag: EXEMPT refactor
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:1337a88d112b005f897b3745b5475cf7d4764db7 )
Merged-In: I8f52d5f86e6ffaccd624846fbe1ba0a8fc842af6
Change-Id: I8f52d5f86e6ffaccd624846fbe1ba0a8fc842af6
2025-01-24 15:53:28 +09:00
Matthew DeVore
1fb8fb0b4f
Show border highlight when dragging display
...
In the process of adding highlight we use an extra feature of
LayerDrawable to add insets so that we can add padding without changing
the actual dimensions or position of the DisplayBlock Views.
To make it easier to keep the values consistent and to aid in conversion
between px and dp, use dimen values to store padding and highlight
metrics.
Bug: b/352650922
Flag: com.android.settings.flags.display_topology_pane_in_display_list
Test: atest DisplayTopologyPreferenceTest.kt
Change-Id: I51ff2ce4a086e84a0c529346f8ede90430090b11
2025-01-23 23:26:53 -06:00
Yiyi Shen
09c8f4fabb
Merge "[Audiosharing] add profile service listener when BT just on" into main
2025-01-23 18:23:17 -08:00
Matthew DeVore
dac774edab
Use correct Settings API to set mirror/extend
...
Flag: com.android.settings.flags.display_topology_pane_in_display_list
Bug: b/366056921
Test: build and SQ
Change-Id: I93ed7159e5ea746fc2d5939fa07e6053803cfc95
2025-01-23 22:00:45 +00:00
Daniel Norman
7e6cc163d9
Merge "Includes new HCT-Migration-Notification entrypoint in a11y stats logs." into main
2025-01-23 10:08:58 -08:00
Treehugger Robot
4f5ccc672f
Merge changes from topic "catalyst" into main
...
* changes:
[Catalyst] Migrate WifiCallingScreen to parameterized screen
[Catalyst] Support parameterized screens
2025-01-23 07:44:29 -08:00
Treehugger Robot
3114fdfaa4
Merge "Fix missing mode title and menu" into main
2025-01-23 05:53:54 -08:00
Pierre Barbier de Reuille
8a42cd7171
Add the new Desktop Experience dev options
...
This option, when available, replaces the enable freeform ones.
Bug: 390625230
Bug: 389092752
Test: atest DesktopExperiencePreferenceControllerTest
Test: atest DesktopModeSecondaryDisplayPreferenceControllerTest
Test: atest DesktopModePreferenceControllerTest
Test: atest FreeformWindowsPreferenceControllerTest
Flag: com.android.window.flags.show_desktop_experience_dev_option
Change-Id: Ib2eaa99fab1fbcae6ed9afa997cfe92676a75c70
2025-01-23 11:01:11 +00:00
Jacky Wang
7a24cd61ac
[Catalyst] Migrate WifiCallingScreen to parameterized screen
...
Bug: 388420844
Bug: 372732219
Flag: com.android.settings.flags.catalyst_wifi_calling
Test: devtool
Change-Id: I322001acc453eae0d69761f7a585c6f33087ef6a
2025-01-23 17:16:41 +08:00
Jacky Wang
1e92038918
[Catalyst] Support parameterized screens
...
Bug: 388420844
Flag: com.android.settings.flags.catalyst
Test: devtool
Change-Id: I73158d8aca0b026d944451289965d72c2c814efb
2025-01-23 17:16:40 +08:00
Yiyi Shen
e9b6016b8d
[Audiosharing] add profile service listener when BT just on
...
If receive BT on while profile service not ready, add profile service
listener and do things, e.g. update preference, when all relative
profile services connected.
Test: atest
Bug: 305620450
Flag: com.android.settingslib.flags.enable_le_audio_sharing
Change-Id: Ie56ed70190285785f1750a7cbbb16029b566fcbe
2025-01-23 15:36:48 +08:00
Chelsea Hao
f956509b8c
Merge "Show qr code in "Share your audio" dialog" into main
2025-01-22 23:35:39 -08:00
chelseahao
b6ba9c3bbc
Show qr code in "Share your audio" dialog
...
Test: atest
Bug: 381775542
Flag: com.android.settingslib.flags.enable_le_audio_sharing
Change-Id: I6fe339beb50803989d4110fca681e609d2d600c1
2025-01-23 14:23:38 +08:00
Treehugger Robot
a9c090df87
Merge "Fix potential NPE in DevelopmentSettingsDashboardFragment" into main
2025-01-22 20:00:37 -08:00
Treehugger Robot
38b843f8ff
Merge "Update Wi-Fi hotspot log" into main
2025-01-22 19:31:53 -08:00
Jacky Wang
f29c38b7c5
Fix potential NPE in DevelopmentSettingsDashboardFragment
...
Fix: 364044354
Flag: EXEMPT bugfix
Test: N/A
Change-Id: If4809b44873c620c615696d697a9f2349dbe7890
2025-01-23 10:53:17 +08:00
Daniel Norman
f362378c03
Merge "Increment TeX counters for the HCT migration notification." into main
2025-01-22 15:55:12 -08:00
Vilas Bhat
3b6958253a
Merge "16KB: Fix failing tests for AOSP targets" into main am: 62c017beb5
am: 78c5a735ad
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3455768
Change-Id: Ia25f358582c9e5a7b515b08bbeb9040e7e76c700
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-01-22 14:58:37 -08:00
Bill Yi
4b92d217f9
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2025-01-22 14:51:31 -08:00
Bill Yi
7ce82a4ccf
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2025-01-22 14:51:31 -08:00
Vilas Bhat
78c5a735ad
Merge "16KB: Fix failing tests for AOSP targets" into main am: 62c017beb5
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3455768
Change-Id: If65e7e554d6b2850436b09de06bb96ac3669fbb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-01-22 14:21:32 -08:00
Daniel Norman
c734de5e80
Includes new HCT-Migration-Notification entrypoint in a11y stats logs.
...
Bug: 391672253
Test: none
Flag: EXEMPT (code which uses this entrypoint is flagged with
com.android.graphics.hwui.flags.high_contrast_text_small_text_rect)
Change-Id: Id99481caa731c5cbff241c054e2c7c9331112cba
2025-01-22 14:13:50 -08:00
Vilas Bhat
62c017beb5
Merge "16KB: Fix failing tests for AOSP targets" into main
2025-01-22 13:55:06 -08:00
Daniel Norman
5b2a769765
Increment TeX counters for the HCT migration notification.
...
See the corresponding TeX change for more details.
Bug: 369906140
Flag: com.android.graphics.hwui.flags.high_contrast_text_small_text_rect
Test: run statsd_testdrive 644 and verify the output when the
notification appears
Test: ensure that rotating / restarting the activity does not trigger
multiple increments to the counter
Change-Id: Iea01962611e3e327cfbde6f3451f7f1ec54b955e
2025-01-22 19:17:31 +00:00
Riley Jones
9707e4039f
Merge "Cleanup of deprecated A11y settings functions" into main
2025-01-22 10:41:05 -08:00
Treehugger Robot
3d626d8e8b
Merge "Partial flag clean up: Remove large mouse pointer in A11y Setting screen" into main
2025-01-22 10:13:34 -08:00
Vitor Carvalho
4c9232dda4
Merge "Fix ActionDisabledByAdminDialogHelperTest by setting a mock SupervisionManager as system service." into main
2025-01-22 10:07:22 -08:00
Marzia Favaro
cc4d5a3b6a
UserAspectRatioManager call AtivityRecord#canBeUniversalResizeable
...
instead of duplicating the method locally.
Fix: 374903057
Flag: EXEMPT same behavior
Test: UserAspectRatioManagerTest
Change-Id: I7b362bf9aaf06e1af0288e0ce8c43e7c3b3472e3
2025-01-22 17:48:32 +00:00
Treehugger Robot
3dcc09cc82
Merge "Fix incorrect region" into main
2025-01-22 09:10:27 -08:00
Vitor Carvalho
e866c91b84
Fix ActionDisabledByAdminDialogHelperTest by setting a mock SupervisionManager as system service.
...
A shadow of DPM is automatically added as system service by Robolectric infra. Since SupervisionManager is new, it doesn't have that.
We will consider changing Robolectric to do the same thing when SupervisionManager becomes more stable.
Flag: TEST_ONLY
Bug: 382034839
Test: atest ActionDisabledByAdminDialogHelperTest
Change-Id: I389938df10ce97c563511473b0aeaee52225f419
2025-01-22 16:53:16 +00:00
Weng Su
6f2b7e4e4a
Update Wi-Fi hotspot log
...
- Update "allowedChannels" log to avoid confusion by "WifiService: getUsableChannels" log
Bug: 390232242
Flag: EXEMPT log only update
Test: Manual testing
Change-Id: I030220d0fa6c28fe2dea06d1c9e64c6ae87b09a8
2025-01-22 22:11:04 +08:00
Matías Hernández
a588f3ebc4
Fix missing mode title and menu
...
By moving these from onStart to onResume. Looks like a recent change to Settings broke this.
Bug: 391543900
Test: manual
Flag: EXEMPT Trivial bugfix
Change-Id: Ie9b8bd08e8513e7c6c2f1baeab4801af2fbe1cae
2025-01-22 14:57:48 +01:00
Allen Su
9e09f00956
Fix incorrect region
...
Bug: 388426025
Test: UI verification
Flag: com.android.settings.flags.regional_preferences_api_enabled
Change-Id: I62df2e3d2111ee45aece7a6af81edc561fe72b07
2025-01-22 11:02:52 +00:00
Chung Tang
bb094b877c
Merge "Accommodate BATT protocol modifications." into main
2025-01-22 02:58:57 -08:00
Bill Yi
e48b8d2724
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I6f5f3f90c7c96e9d50afad96bf7a14ab84e6c0f9
2025-01-22 01:22:42 -08:00
Bill Yi
e29f9d6486
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I42ec2ebc50027441018a073c2c0238b8018c0d3f
2025-01-22 01:20:49 -08:00
Yiyi Shen
a618a8a241
Merge "[Audiosharing] Move entry preference out of group category" into main
2025-01-22 01:09:08 -08:00
Chung Tang
8a6ea1a106
Accommodate BATT protocol modifications.
...
Bug: 380790573
Test: atest com.android.settings.bluetooth.AdvancedBluetoothDetailsHeaderControllerTest and Manual
Flag: com.android.settings.flags.enable_battery_level_display
Change-Id: Ibc4eb66aacedaf3a4111d4a411dada6cde1a5b9c
2025-01-22 00:14:53 -08:00
Yiyi Shen
001ec9d33e
Merge "[Audiosharing] Avoid popup dialog when broadcast start in SysUI" into main
2025-01-22 00:02:30 -08:00