Commit Graph

146361 Commits

Author SHA1 Message Date
Pawan Wagh
65263376f7 Updating the notification ID
PageAgnosticNotificationService - updating notification id to avoid the notification being dismissed accidentally by other notifications. ID used is the bug id where this was reported.

Change-Id: I267eed1d14158f06ea688a48c65be209993b869d
Test: atest Enable16KbTest
Bug: 388678898
2025-01-17 11:24:39 -08:00
Randy Pfohl
857777b7d5 Merge "update string to remove duplicate accessibility readout" into main 2025-01-17 10:41:24 -08:00
Matthew DeVore
b9ea2e327f DisplayTopology: user cannot drag only display
When dragging a single display, we don't constrain the position of the
display, and the user can drag it anywhere on the fragment. As such we
need to either prevent the drag or refresh the pane always if there is
only one display. This CL chooses the former.

Flag: com.android.settings.flags.display_topology_pane_in_display_list
Test: atest DisplayTopologyPreferenceTest.kt
Bug: b/352650922
Change-Id: Icb101b734ce9b88435f64a71bf77f878f9b230e0
2025-01-17 18:17:17 +00:00
Joshua McCloskey
f2e29d4359 A11y pattern view is no longer selectable
Fixes: 386873612
Fixes: 386873927
Test: Verified pattern view is no longer selectable, but cells are still
announced.
Flag: EXEMPT bugfix

Change-Id: If80da276f2a33206c39552b6b86a92c899f865a9
2025-01-17 09:17:18 -08:00
Joshua Mccloskey
496dcd3eb7 Merge "Pattern a11y fix" into main 2025-01-17 09:12:56 -08:00
yomna
378de71cb4 Check for any valid SIM card before showing Cellular Security Settings
Bug: 377358721
Test: m
Flag: EXEMPT bugfix
Change-Id: I5bbc0c95ff420639c274534b9086a3479ca47fb2
2025-01-17 16:55:16 +00:00
Randy Pfohl
4384745517 update string to remove duplicate accessibility readout
bug: 386688984

Test: built locally

Flag: NONE not needed

Change-Id: Ie8e0c25a753bd7dacb9145b58dbffc5f89ff6808
2025-01-17 16:52:40 +00:00
Harry Cutts
f4e8617821 Give input team ownership of mouse-related settings files
Bug: 245989146
Change-Id: I5961839b290af88784da525ff937ff6d6f148963
Test: none
Flag: EXEMPT only changing OWNERS
2025-01-17 07:32:17 -08:00
Treehugger Robot
07eca37281 Merge "[Catalyst] Rollback the Adaptive brightness key" into main 2025-01-17 06:31:32 -08:00
Yiyi Shen
d77fd9689e [Audiosharing] Avoid popup dialog when broadcast start in SysUI
Test: atest
Bug: 305620450
Flag: com.android.settingslib.flags.enable_le_audio_sharing
Change-Id: I447aeb7e9646a5f9278fd2def8a2a9e6a59ac47e
2025-01-17 17:51:47 +08:00
Sunny Shao
03de6af4fc [Catalyst] Rollback the Adaptive brightness key
Let the redirect highlight function work from Turbo app.

NO_IFTTT=Catalyst migration

Test: devtool, atest AutoBrightnessScreenTest
Bug: 390525596
Flag: com.android.settings.flags.catalyst_display_settings_screen
Change-Id: Id7261d8a51368c45b7e23fee911565a226b30779
2025-01-17 08:27:02 +00:00
Jacky Wang
68178f684e [Catalyst] Refine AmbientDisplayAlwaysOnPreference datastore
NO_IFTTT=Catalyst only

Bug: 372307567
Flag: com.android.settings.flags.catalyst_lockscreen_from_display_settings
Test: devtool
Change-Id: Icd7990d4bb42c2ed5e3432d0dd81473217913b56
2025-01-17 16:05:42 +08:00
Lorenzo Lucena Maguire
081836703a Create Double Tap Power Settings Activity
Test: manually launched activity
Bug: 390257067
Flag: EXEMPT declared activity in xml
Change-Id: Idc858b4e916df7e716790b7297b1bd5a58874452
2025-01-17 07:58:21 +00:00
Ze Li
6237fd2826 Merge "[Temp bonding] Updater for the guest list to store temp bond device" into main 2025-01-16 23:20:21 -08:00
Justin Yun
1337a88d11 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
Change-Id: I8f52d5f86e6ffaccd624846fbe1ba0a8fc842af6
2025-01-17 15:03:58 +09:00
Treehugger Robot
9f654f4ec0 Merge "[Catalyst] Remove PreferenceMetadata usages" into main 2025-01-16 20:18:24 -08:00
Jean Chen
fb0e99f905 Merge "Update HCT strings to Text outlines after UXW feedback." into main 2025-01-16 20:00:08 -08:00
Fan Wu
297941ba2f [Catalyst] Remove PreferenceMetadata usages
Classes that implement PersistentPreference don't need to implement PreferenceMetadata

Bug: 388167302
Test: atest and manual
Flag: EXEMPT refactor
NO_IFTTT=refactor

Change-Id: Icf7d5eb4bbd426eb7e8dd562eda3c0a775457a3e
2025-01-16 17:46:28 -08:00
Bill Yi
5810ae96ab Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I27a8bfefdac45cd0125f36e388b42202e8eb296c
2025-01-16 16:29:28 -08:00
Bill Yi
488bc5bb6c Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I4e054ba5cbe2fde0f7aff0530099a3965123d23a
2025-01-16 16:27:17 -08:00
Yining Liu
8b94618dd8 Merge "Notification on lockscreen settings: add WhatToShowController" into main 2025-01-16 15:38:58 -08:00
Daniel Norman
c0d57d06b7 Update HCT strings to Text outlines after UXW feedback.
Fix: 384791485
Test: see screenshots in bug
Flag: EXEMPT resource only strings change
Change-Id: I8f3f5bdd93cc13b308b155e45e2ea97e03257abc
2025-01-16 23:10:15 +00:00
Yongshun Liu
c0e9a84e85 Merge "a11y: Make images optional for single choice list view dialog" into main 2025-01-16 15:07:19 -08:00
Wenyu Zhang
c29bde48a7 Merge "a11y: Hook ignore minor cursor movement setting to its controller" into main 2025-01-16 14:45:21 -08:00
Joshua McCloskey
ab58cb91a9 Pattern a11y fix
Test: Verified that the next button is no longer disabled, user can
click it
Fixes: 376175416
Flag: EXEMPT bugfix

Change-Id: I30fd80d96b8702e1c8b4bc50dad4c486b220a531
2025-01-16 14:39:44 -08:00
Treehugger Robot
7dda1158d1 [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: 36865a5751 -s ours am: df4d22f184 -s ours am: e834ae431d -s ours am: b9fe162f05 -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: I0b430b92426e99d1b7b0b56ad61e45353a71d721
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-16 13:59:55 -08:00
Mill Chen
98b5d53a72 [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: e79d063755 -s ours am: 3c1918c941 -s ours am: 69bc34d144 -s ours am: 33ca80108f -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: I27de04743e583f749246494cb9318d93784fbe6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-16 13:59:50 -08:00
Treehugger Robot
cb57e6d444 [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: 22f338e161 -s ours am: 768999cad4 -s ours am: e8d093b64d -s ours am: f658361f31 -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: I51fc582c4f186d9edc1abf18119a8a617c728f29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-16 13:59:19 -08:00
Mill Chen
4991345ef1 [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: be6d3de6be -s ours am: 0a93ced740 -s ours am: f17bcecb1b -s ours am: 0692379e51 -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: I4a529254ef8b89850f0a998dfac936a7bef0cbc4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-16 13:59:14 -08:00
Treehugger Robot
06bafc8920 [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: 69f63f44a0 -s ours am: 8b97d6b8a5 -s ours am: b5228b5360 -s ours am: 309b40603e -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: Iba1c0253901ee4858f6c5854f5b58ddd7c2aa09c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-16 13:58:59 -08:00
Mill Chen
1c35211451 [automerger skipped] Add default Sound Picker package name am: 94681e3436 -s ours am: d0dd552cae -s ours am: 1aa0fd60a2 -s ours am: 0f40040391 -s ours am: 7444cfa7dd -s ours am: 3a5017386d -s ours am: 5a3347dc2f -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: I39e8e5064e945601c7321726a9da7456a7acb155
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-16 13:58:54 -08:00
Treehugger Robot
34b49c45f6 [automerger skipped] Merge "Add default Sound Picker package name" into tm-dev am: fa833f8136 am: 6608cb542f -s ours am: d601d2ef19 -s ours am: 0eb554fb17 -s ours am: 9a2fd9afc5 -s ours am: 7159ce70e2 -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: I155084013b30eab2983ca274de13a28e8ed68395
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-16 13:58:15 -08:00
Hao Dong
795a202666 [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: e71bb309ce -s ours am: 01a7a51708 -s ours am: 8c0855dcaa -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: I339b92ddeec7c8703892fc63f7caa255084b6069
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-16 13:42:20 -08:00
Hao Dong
c3b2d0eebc [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: 9608d3384c -s ours am: 60e8203c45 -s ours am: 515af80bc9 -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: I05fb7f17f95c84bb5e3bb8bb1ece88c99473921e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-16 13:42:14 -08:00
Hao Dong
556ea75658 [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: 1f4dbc2c07 -s ours am: 8d9f96e522 -s ours am: 2744527e63 -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: Id2fdad279a140306c594a95cc23bdac5aacf72b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-16 13:39:15 -08:00
Hao Dong
5a89d20fe5 [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: ddc286e72c -s ours am: 421660fa47 -s ours am: bc73940b4f -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: I7081d8ab37032ee2425ccca16649ed9aa99c3aa7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-16 13:39:09 -08:00
Hao Dong
c52dd7d188 [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: b7c547504a -s ours am: 4599f41227 -s ours am: b7427f3980 -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: I299120e29872a05b786062f4eb476b2ec939aff3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-16 13:35:13 -08:00
Hao Dong
89ca0ecb1b [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: d33c418fed -s ours am: ed9321374b -s ours am: 9fe74b4c21 -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: Ib860fefa6d46d037e7977cca3435acc35a980966
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-16 13:35:05 -08:00
Hao Dong
165b94ca59 [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: f22aa1453d -s ours am: e5704f8892 -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: I9015fb233be9f677ffe31a600398a70608a56b58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-16 13:33:16 -08:00
Treehugger Robot
f27bf4d241 [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: 36865a5751 -s ours am: df4d22f184 -s ours am: b910ad3a9e -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: Idfcefd9c5dea61132eeffca23fc55e84ee8db197
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-16 13:27:35 -08:00
Mill Chen
ad50469a5f [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: e79d063755 -s ours am: 3c1918c941 -s ours am: 7d6f1c2860 -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: Id3c526b67023643fd60f19918826d8b2da6cb1d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-16 13:27:28 -08:00
Yongshun Liu
09b11ff3d3 a11y: Make images optional for single choice list view dialog
This makes `ItemInfoArrayAdapter.ItemInfo` support text-only choices. It
is to better accommodate the new dialogs.

Bug: b/389991440
Flag: com.android.settings.accessibility.enable_magnification_cursor_following_dialog
Test: None
Change-Id: If7514631a72631cf0fce85623fe30c8261f678c9
2025-01-16 21:27:02 +00:00
Treehugger Robot
5693209da7 [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: 22f338e161 -s ours am: 768999cad4 -s ours am: 43c256af23 -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: Idf44ca68c62cbd2bc094a725278c1852db139014
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-16 13:25:49 -08:00
Mill Chen
5f8958e567 [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: be6d3de6be -s ours am: 0a93ced740 -s ours am: 04fb1f0fbf -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: I349c893c3f4604aeab7ee36d4a18be1372d5a3d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-16 13:25:44 -08:00
Treehugger Robot
236e791772 [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: 69f63f44a0 -s ours am: 8b97d6b8a5 -s ours am: 9cf7e51e14 -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: I3ea21a571007a8678b585f563ef56dcae9a7f9b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-16 13:25:29 -08:00
Mill Chen
266dffae79 [automerger skipped] Add default Sound Picker package name am: 94681e3436 -s ours am: d0dd552cae -s ours am: 1aa0fd60a2 -s ours am: 0f40040391 -s ours am: 7444cfa7dd -s ours am: 50c170c738 -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: Ia9a820ded7efbad42737913cd83385d6eb95f636
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-16 13:25:23 -08:00
Treehugger Robot
82ff693a07 [automerger skipped] Merge "Add default Sound Picker package name" into tm-dev am: fa833f8136 am: 6608cb542f -s ours am: d601d2ef19 -s ours am: 0eb554fb17 -s ours am: ff8cf6847f -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: I820831b6b0b557250c3459ab94c5b1f483f2f8bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-16 13:23:57 -08:00
Hao Dong
13402a2081 [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: e71bb309ce -s ours am: 3ba7db7e1d -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: I275f1e0d1620e770b9bc8a864bab4b412e246569
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-16 13:05:18 -08:00
Hao Dong
b3ee2e5dcc [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: 9608d3384c -s ours am: 523a01eebd -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: Ida4271da175e5ed5350b524a3b49132f3bcf33eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-16 13:05:09 -08:00
Hao Dong
896bef9695 [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: 1f4dbc2c07 -s ours am: 64aaef3398 -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: I88e730dc9b6a298d771a3fa66e60fcf8583fdd71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-16 13:01:41 -08:00