Hao Dong
6680b3cb90
[automerger skipped] Merge "Set class name when createConfirmDeviceCredentialIntent() API is used." into tm-dev am: 5b67d6e863
am: 2688ddf907
-s ours am: c62982e22d
-s ours am: 744e8a83f6
-s ours
...
am skip reason: Merged-In I762f280def79d428ed9cf119ace5ccc2b6be2560 with SHA-1 d158b1675a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28784982
Change-Id: Iff46f2acd9a26394c86f8caee1fa826cde859b99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-01-16 12:27:04 -08:00
Hao Dong
f22aa1453d
[automerger skipped] Merge "Set class name when createConfirmDeviceCredentialIntent() API is used." into tm-dev am: 5b67d6e863
am: 2688ddf907
-s ours am: c62982e22d
-s ours am: 744e8a83f6
-s ours
...
am skip reason: Merged-In I762f280def79d428ed9cf119ace5ccc2b6be2560 with SHA-1 d158b1675a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28784982
Change-Id: I7adac467aeefb84134908bc911da108ef2678736
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-01-16 12:26:26 -08:00
Treehugger Robot
0eb554fb17
[automerger skipped] Merge "Add default Sound Picker package name" into tm-dev am: fa833f8136
am: 6608cb542f
-s ours am: d601d2ef19
-s ours
...
am skip reason: Merged-In I905c0f3ddaf0f488ff2fc3bf1747b6df0d802504 with SHA-1 89a32bb7d2
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31043662
Change-Id: Ib8af57431535c3c65299704a1875c3d2c526dcca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-01-16 12:21:41 -08:00
Hao Dong
e71bb309ce
[automerger skipped] Merge "Set class name when createConfirmDeviceCredentialIntent() API is used." into sc-dev am: bc358528fe
-s ours am: 559fb5441d
-s ours am: 73064f1b5a
-s ours am: 7dfe8021fe
-s ours am: 7c0712690d
-s ours am: 60e00959b1
-s ours
...
am skip reason: Merged-In I762f280def79d428ed9cf119ace5ccc2b6be2560 with SHA-1 c70e6bf477
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28784981
Change-Id: I7f31fdc3be63717485dc0e8832cf2b49dc60ed3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-01-16 12:11:44 -08:00
Hao Dong
9608d3384c
[automerger skipped] Set class name when createConfirmDeviceCredentialIntent() API is used. am: 931b100159
-s ours am: 3acc39816b
-s ours am: 509c6a4896
-s ours am: 5c3a672d74
-s ours am: 254a61da77
-s ours am: ab3c46447c
-s ours
...
am skip reason: Merged-In I762f280def79d428ed9cf119ace5ccc2b6be2560 with SHA-1 c70e6bf477
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28784981
Change-Id: I2c3c84e7ece36da84240419c8b4e04921ff940db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-01-16 12:11:34 -08:00
Hao Dong
1f4dbc2c07
[automerger skipped] Merge "Set class name when createConfirmDeviceCredentialIntent() API is used." into sc-qpr1-dev am: aad0b6827b
-s ours am: dc418ca7bf
-s ours am: 6f3bb938f7
-s ours am: 8c4d5f0575
-s ours am: fd697a8b25
-s ours
...
am skip reason: Merged-In I762f280def79d428ed9cf119ace5ccc2b6be2560 with SHA-1 417970a8ca
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29913410
Change-Id: Iee7f42e994cb891d11e87a374acd8c3e66dedd37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-01-16 12:09:53 -08:00
Hao Dong
ddc286e72c
[automerger skipped] Set class name when createConfirmDeviceCredentialIntent() API is used. am: c70e6bf477
-s ours am: 717ffa9a1b
-s ours am: 97e41c368d
-s ours am: d7aee3ecb3
-s ours am: 5610a1295e
-s ours
...
am skip reason: Merged-In I762f280def79d428ed9cf119ace5ccc2b6be2560 with SHA-1 417970a8ca
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29913410
Change-Id: I1d05d31fa59e328120f419fabbd0595bb80c1dd7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-01-16 12:09:45 -08:00
Hao Dong
b7c547504a
[automerger skipped] Merge "Set class name when createConfirmDeviceCredentialIntent() API is used." into sc-v2-dev am: a0b42f7f95
-s ours am: 66f8db84d6
-s ours am: 901e7377cc
-s ours am: 1017ec16c0
-s ours
...
am skip reason: Merged-In I762f280def79d428ed9cf119ace5ccc2b6be2560 with SHA-1 2b7c1f1105
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29911394
Change-Id: I29859fc7393f21fda7196154f138c77780ba1b35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-01-16 12:07:56 -08:00
Hao Dong
d33c418fed
[automerger skipped] Set class name when createConfirmDeviceCredentialIntent() API is used. am: 417970a8ca
-s ours am: 19c298d5a9
-s ours am: 9cce9a26c7
-s ours am: a6b7b2ac39
-s ours
...
am skip reason: Merged-In I762f280def79d428ed9cf119ace5ccc2b6be2560 with SHA-1 2b7c1f1105
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29911394
Change-Id: I6ae06245acbe0adcc7d202d397bd57c4b47b3e04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-01-16 12:07:47 -08:00
Hao Dong
744e8a83f6
[automerger skipped] Merge "Set class name when createConfirmDeviceCredentialIntent() API is used." into tm-dev am: 5b67d6e863
am: 2688ddf907
-s ours am: c62982e22d
-s ours
...
am skip reason: Merged-In I762f280def79d428ed9cf119ace5ccc2b6be2560 with SHA-1 d158b1675a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28784982
Change-Id: I1e7cfa4e05739f974a40e1a8043aab9f033c5589
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-01-16 12:06:35 -08:00
Treehugger Robot
36865a5751
[automerger skipped] Merge "Add default Sound Picker package name" into sc-dev am: 3d8ba6008c
-s ours am: 7cb1618980
-s ours am: 824728dc07
-s ours am: 629e93f0ca
-s ours am: 7fca233336
-s ours
...
am skip reason: Merged-In I905c0f3ddaf0f488ff2fc3bf1747b6df0d802504 with SHA-1 cf52112bcb
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30999368
Change-Id: I76b7de5bde86cb82ef29492c40e0edc0db887c3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-01-16 11:48:09 -08:00
Mill Chen
e79d063755
[automerger skipped] Add default Sound Picker package name am: b1e4cd09ff
-s ours am: 345e6a1f4c
-s ours am: 274974dc1a
-s ours am: ee80b3073e
-s ours am: ece26c04f9
-s ours
...
am skip reason: Merged-In I905c0f3ddaf0f488ff2fc3bf1747b6df0d802504 with SHA-1 cf52112bcb
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30999368
Change-Id: I85f577ce38aed775bde711689c8677f81dc04a79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-01-16 11:48:06 -08:00
Treehugger Robot
22f338e161
[automerger skipped] Merge "Add default Sound Picker package name" into sc-qpr1-dev am: 52b5adcf0b
-s ours am: 76d6e72d12
-s ours am: baf44d4c5f
-s ours am: b6276b4d18
-s ours
...
am skip reason: Merged-In I905c0f3ddaf0f488ff2fc3bf1747b6df0d802504 with SHA-1 94681e3436
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30999367
Change-Id: Ife51922eb59c570d96cc9de7873cb63a0ce30142
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-01-16 11:44:49 -08:00
Mill Chen
be6d3de6be
[automerger skipped] Add default Sound Picker package name am: cf52112bcb
-s ours am: 85c25ba154
-s ours am: 97e4b8156b
-s ours am: 786f599ba8
-s ours
...
am skip reason: Merged-In I905c0f3ddaf0f488ff2fc3bf1747b6df0d802504 with SHA-1 94681e3436
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30999367
Change-Id: I8c859957c66fefed1cf5256896f80f0e63cf9172
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-01-16 11:44:45 -08:00
Treehugger Robot
69f63f44a0
[automerger skipped] Merge "Add default Sound Picker package name" into sc-v2-dev am: 2543e710f6
-s ours am: 122466050a
-s ours am: eebbed928c
-s ours
...
am skip reason: Merged-In I905c0f3ddaf0f488ff2fc3bf1747b6df0d802504 with SHA-1 be15ba86a7
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31070056
Change-Id: I445939d38bc2cd07ccdbb2850bff5e6d38dff2dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-01-16 11:44:22 -08:00
Mill Chen
0f40040391
[automerger skipped] Add default Sound Picker package name am: 94681e3436
-s ours am: d0dd552cae
-s ours am: 1aa0fd60a2
-s ours
...
am skip reason: Merged-In I905c0f3ddaf0f488ff2fc3bf1747b6df0d802504 with SHA-1 be15ba86a7
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31070056
Change-Id: I6ec3242887982e0f02040ccf5dc1de7307128025
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-01-16 11:44:19 -08:00
Treehugger Robot
d601d2ef19
[automerger skipped] Merge "Add default Sound Picker package name" into tm-dev am: fa833f8136
am: 6608cb542f
-s ours
...
am skip reason: Merged-In I905c0f3ddaf0f488ff2fc3bf1747b6df0d802504 with SHA-1 89a32bb7d2
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31043662
Change-Id: I07c64e5faf1a3e7cd523e390a67acf15017c6edf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-01-16 11:42:36 -08:00
Hao Dong
60e00959b1
[automerger skipped] Merge "Set class name when createConfirmDeviceCredentialIntent() API is used." into sc-dev am: bc358528fe
-s ours am: 559fb5441d
-s ours am: 73064f1b5a
-s ours am: 7dfe8021fe
-s ours am: 7c0712690d
-s ours
...
am skip reason: Merged-In I762f280def79d428ed9cf119ace5ccc2b6be2560 with SHA-1 c70e6bf477
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28784981
Change-Id: Ie79f07c5b2160ba32456abc696d0a80a99a09c3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-01-16 11:42:04 -08:00
Hao Dong
ab3c46447c
[automerger skipped] Set class name when createConfirmDeviceCredentialIntent() API is used. am: 931b100159
-s ours am: 3acc39816b
-s ours am: 509c6a4896
-s ours am: 5c3a672d74
-s ours am: 254a61da77
-s ours
...
am skip reason: Merged-In I762f280def79d428ed9cf119ace5ccc2b6be2560 with SHA-1 c70e6bf477
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28784981
Change-Id: Ia93674960ddd3863f7f95480610e28344d80e307
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-01-16 11:42:00 -08:00
Hao Dong
fd697a8b25
[automerger skipped] Merge "Set class name when createConfirmDeviceCredentialIntent() API is used." into sc-qpr1-dev am: aad0b6827b
-s ours am: dc418ca7bf
-s ours am: 6f3bb938f7
-s ours am: 8c4d5f0575
-s ours
...
am skip reason: Merged-In I762f280def79d428ed9cf119ace5ccc2b6be2560 with SHA-1 417970a8ca
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29913410
Change-Id: Icd1d3c8b1c2851029c6ab6c162607c3ca5094f6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-01-16 11:41:00 -08:00
Hao Dong
5610a1295e
[automerger skipped] Set class name when createConfirmDeviceCredentialIntent() API is used. am: c70e6bf477
-s ours am: 717ffa9a1b
-s ours am: 97e41c368d
-s ours am: d7aee3ecb3
-s ours
...
am skip reason: Merged-In I762f280def79d428ed9cf119ace5ccc2b6be2560 with SHA-1 417970a8ca
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29913410
Change-Id: I6ff125ed1eaf9acd9e3b396ee9a50be4fcd91a57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-01-16 11:40:53 -08:00
Hao Dong
1017ec16c0
[automerger skipped] Merge "Set class name when createConfirmDeviceCredentialIntent() API is used." into sc-v2-dev am: a0b42f7f95
-s ours am: 66f8db84d6
-s ours am: 901e7377cc
-s ours
...
am skip reason: Merged-In I762f280def79d428ed9cf119ace5ccc2b6be2560 with SHA-1 2b7c1f1105
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29911394
Change-Id: Id4db3bd172b7a97de8349092909135ed301f84bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-01-16 11:39:32 -08:00
Hao Dong
a6b7b2ac39
[automerger skipped] Set class name when createConfirmDeviceCredentialIntent() API is used. am: 417970a8ca
-s ours am: 19c298d5a9
-s ours am: 9cce9a26c7
-s ours
...
am skip reason: Merged-In I762f280def79d428ed9cf119ace5ccc2b6be2560 with SHA-1 2b7c1f1105
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29911394
Change-Id: I354f3ee7f14204925feadede8344e56451defa5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-01-16 11:39:29 -08:00
Hao Dong
c62982e22d
[automerger skipped] Merge "Set class name when createConfirmDeviceCredentialIntent() API is used." into tm-dev am: 5b67d6e863
am: 2688ddf907
-s ours
...
am skip reason: Merged-In I762f280def79d428ed9cf119ace5ccc2b6be2560 with SHA-1 d158b1675a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28784982
Change-Id: I20dcc3ae5ad2cbdebf068f40a5f04b17f65377ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-01-16 11:38:26 -08:00
Ioana Alexandru
878f860fd3
Merge "Rename SettingsEnableZenModeDialog to EnableDndDialogFragment" into main
2025-01-16 08:39:36 -08:00
Julia Reynolds
f9b8f5af38
Merge "Align history styling with Settings" into main
2025-01-16 06:02:24 -08:00
Treehugger Robot
1ac39a1547
Merge "[Catalyst] Leverage PrimarySwitchPreferenceBinding" into main
2025-01-16 03:40:40 -08:00
Josep del Río
733f174fbd
Merge "Fix multiple layouts marked as selected" into main
2025-01-16 01:33:54 -08:00
Jacky Wang
5a747c5a14
[Catalyst] Leverage PrimarySwitchPreferenceBinding
...
NO_IFTTT=Catalyst only
Bug: 335132588
Flag: com.android.settings.flags.catalyst
Test: manual
Change-Id: I3a566d98500bd09526c1f8d34fb7c47e9dff68b7
2025-01-16 17:13:20 +08:00
Treehugger Robot
fd7927bd79
Merge "[Catalyst] Rename BooleanPreference to BooleanValuePreference" into main
2025-01-16 00:55:23 -08:00
Zoey Chen
cc0c66a7ee
Merge "[Settings] Create new controller for app language: suggested locale" into main
2025-01-16 00:29:41 -08:00
Zoey Chen
1daa1bb380
[Settings] Create new controller for app language: suggested locale
...
Bug: 388199937
Test: manual
Flag: EXEMPT refactor
Change-Id: I45ddbfb460365e3ff4858de0c0411c7a46d49302
2025-01-16 06:58:44 +00:00
Fan Wu
9782d86786
[Catalyst] Rename BooleanPreference to BooleanValuePreference
...
Bug: 388167302
Test: atest and manual
Flag: EXEMPT refactor
NO_IFTTT=refactor
Change-Id: Id447d0729b9202df96b610c3991f9d03dda8c811
2025-01-15 22:34:35 -08:00
Treehugger Robot
03556af237
Merge "[Catalyst] Keep activity title in sync with PreferenceFragment" into main
2025-01-15 22:33:10 -08:00
Jacky Wang
8672a5e2ef
[Catalyst] Keep activity title in sync with PreferenceFragment
...
Fix: 390135885
Flag: com.android.settings.flags.catalyst
Test: manual
Change-Id: I0a8edbc6fa2a13d653a85ddfe36bd551e09796f8
2025-01-16 12:26:13 +08:00
Chelsea Hao
97ccf7d696
Merge "Use LocalBluetoothLeBroadcastSourceState
." into main
2025-01-15 19:11:20 -08:00
Jacky Wang
f597576f55
Merge changes from topic "catalyst" into main
...
* changes:
[Catalyst] Update metrics logging for AirplaneModePreference
[Catalyst] Setup metrics logger for preference ui action
2025-01-15 18:29:02 -08:00
Yuhan Yang
b95bc6620d
Merge "Grey out scrolling speed slider bar" into main
2025-01-15 17:35:50 -08:00
Lorenzo Lucena Maguire
30943c6984
Merge "Update Double Press Power Button settings Strings" into main
2025-01-15 17:07:43 -08:00
Lorenzo Lucena Maguire
537a0d5257
Update Double Press Power Button settings Strings
...
Test: atest
Bug: 389122652
Flag: EXEMPT xml only
Change-Id: I35136be0292b91c276928bb7138e5aecc6d0ec33
2025-01-15 23:40:21 +00:00
Jacky Wang
22ce449414
[Catalyst] Update metrics logging for AirplaneModePreference
...
NO_IFTTT=Catalyst only
Bug: 386330825
Bug: 389886085
Flag: com.android.settings.flags.catalyst
Test: atest
Change-Id: I1d1fced2e24bd10839dd8f29a6fdd6f0bd04667c
2025-01-16 07:30:38 +08:00
Jacky Wang
22d3b0420e
[Catalyst] Setup metrics logger for preference ui action
...
Bug: 389886085
Flag: com.android.settings.flags.catalyst
Test: atest&manual
Change-Id: I8c3ce6cbdeeefe7857132a40ea486d0f56928d7a
2025-01-16 07:30:38 +08:00
Yongshun Liu
4d5fe47420
Merge "a11y: Add aconfig flag for magnification cursor following dialog" into main
2025-01-15 13:45:08 -08:00
Joshua Mccloskey
0e5717b3a6
Merge "Fixed Pattern SUW a11y bug" into main
2025-01-15 12:34:39 -08:00
Daniel Norman
e8f5daaf88
Merge "fix(HCT):Ensure HCT Notification ID does not conflict in the Settings app" into main
2025-01-15 11:34:28 -08:00
Joshua McCloskey
53ac9161d3
Fixed Pattern SUW a11y bug
...
Test: Verified that setting up a patter nduring SUW no longer announces
a long peice of text after clearing the pattern.
Fixes: 386859835
Flag: EXEMPT bugfix
Change-Id: I7350aba7d3f0665f204758241af02eeaad8cc1d5
2025-01-15 19:17:23 +00:00
Riley Jones
e5649f2ca6
Merge "Cleanup qs shortcut flag in OneHandedSettingsUtils" into main
2025-01-15 10:51:57 -08:00
Ioana Alexandru
07534f76a9
Rename SettingsEnableZenModeDialog to EnableDndDialogFragment
...
We also renamed the base EnableZenModeDialog to
EnableDndDialogFactory, see other CL in topic.
Flag: EXEMPT trivial rename
Test: builds
Bug: 388261320
Change-Id: Iaa2043bbb8d1f62482d0c38d0951da4025676f27
2025-01-15 17:42:23 +01:00
Yiyi Shen
9c1447536a
Merge "[Audiosharing] Use setBroadcastToUnicastFallbackGroup to set primary" into main
2025-01-15 02:34:03 -08:00
Dipankar Bhardwaj
5488817d0a
Merge "Use RELEASE_OR_PREVIEW_DISPLAY to show android build version" into main
2025-01-15 02:29:59 -08:00