Commit Graph

127402 Commits

Author SHA1 Message Date
Matías Hernández
7847d336d9 Settings: don't try to allow NLSes with too-long component names am: b88fbf932a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23728493

Change-Id: Ib235490bd7dc40a1d5146cdb8ea20abed4406996
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-29 00:16:39 +00:00
Matías Hernández
42afd3c182 Settings: don't try to allow NLSes with too-long component names am: b88fbf932a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23728493

Change-Id: I3228d4d29e905c0481fe1637580aaf2caaab9cc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-29 00:15:34 +00:00
Grace Cheng
ccc1c6c749 [automerger skipped] Merge "Fix NPE in updateAddPreference" into udc-dev am: 25b489e212 -s ours am: d7e397e97c -s ours am: ab1b393412 -s ours
am skip reason: Merged-In Id7edde492168b467360c6c99b326721cd883bba8 with SHA-1 2365ad895a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23667755

Change-Id: I449ef5d9d54e452aeb251cd3b35d7053db0c9be2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-28 19:47:59 +00:00
Grace Cheng
6066b06cc1 [automerger skipped] Fix NPE in updateAddPreference am: f58714496a -s ours am: 0dcfdacc25 -s ours am: d320388f91 -s ours
am skip reason: Merged-In Id7edde492168b467360c6c99b326721cd883bba8 with SHA-1 2365ad895a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23667755

Change-Id: I5cd9867bbf15aaafa226abb874766c258eb2ed55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-28 19:47:57 +00:00
Grace Cheng
3132c57c05 [automerger skipped] Merge "Fix NPE in updateAddPreference" into udc-dev am: 25b489e212 -s ours am: d7e397e97c -s ours am: 71671c1eca -s ours
am skip reason: Merged-In Id7edde492168b467360c6c99b326721cd883bba8 with SHA-1 2365ad895a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23667755

Change-Id: I1917b214ecfec15eb9630bf6780a3c2bf6e33c9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-28 19:46:37 +00:00
Grace Cheng
40e82e3a47 [automerger skipped] Fix NPE in updateAddPreference am: f58714496a -s ours am: 0dcfdacc25 -s ours am: 2ee3088167 -s ours
am skip reason: Merged-In Id7edde492168b467360c6c99b326721cd883bba8 with SHA-1 2365ad895a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23667755

Change-Id: Ie148ac91f62cf55ff53e1c3df8b6b334997e2c60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-28 19:46:35 +00:00
Grace Cheng
39f518b258 [automerger skipped] Merge "Fix NPE in updateAddPreference" into udc-dev am: 25b489e212 am: f73f073643 -s ours am: 60f4e180a2 -s ours
am skip reason: Merged-In Id7edde492168b467360c6c99b326721cd883bba8 with SHA-1 2365ad895a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23667755

Change-Id: I730dab9c7076a3abbae467fbb30b3d9cd0298f1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-28 19:45:11 +00:00
Matías Hernández
f03e08c644 Merge "Settings: don't try to allow NLSes with too-long component names" into udc-dev am: 4d34eb2c7a am: 0d21526217 am: 63a50999f5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726247

Change-Id: Ice022fe659e4a48ee5ae79c16f8b950479ad2b57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-28 19:44:09 +00:00
Matías Hernández
bb3122ca29 Merge "Settings: don't try to allow NLSes with too-long component names" into udc-dev am: 4d34eb2c7a am: aaddfd88e9 am: 9feb898da7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726247

Change-Id: I029027019505a86fbf88ad4a127d6f0ffa11ce79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-28 19:41:36 +00:00
Grace Cheng
ab1b393412 [automerger skipped] Merge "Fix NPE in updateAddPreference" into udc-dev am: 25b489e212 -s ours am: d7e397e97c -s ours
am skip reason: Merged-In Id7edde492168b467360c6c99b326721cd883bba8 with SHA-1 2365ad895a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23667755

Change-Id: I666bbd8a1c16dabbab2c695c952931780f18e024
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-28 19:03:42 +00:00
Grace Cheng
d320388f91 [automerger skipped] Fix NPE in updateAddPreference am: f58714496a -s ours am: 0dcfdacc25 -s ours
am skip reason: Merged-In Id7edde492168b467360c6c99b326721cd883bba8 with SHA-1 2365ad895a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23667755

Change-Id: I2be7f013fed0d18eeec29f0461e7891eabc287ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-28 19:03:40 +00:00
Grace Cheng
71671c1eca [automerger skipped] Merge "Fix NPE in updateAddPreference" into udc-dev am: 25b489e212 -s ours am: d7e397e97c -s ours
am skip reason: Merged-In Id7edde492168b467360c6c99b326721cd883bba8 with SHA-1 2365ad895a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23667755

Change-Id: I7d179a1b1ac8465fea36a14ca04e57aed6db1cd0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-28 18:59:50 +00:00
Grace Cheng
2ee3088167 [automerger skipped] Fix NPE in updateAddPreference am: f58714496a -s ours am: 0dcfdacc25 -s ours
am skip reason: Merged-In Id7edde492168b467360c6c99b326721cd883bba8 with SHA-1 2365ad895a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23667755

Change-Id: I40e8eaf893dac682f8120213c32c28025fbbf29f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-28 18:59:47 +00:00
Matías Hernández
281c4b631c Merge "Settings: don't try to allow NLSes with too-long component names" into udc-dev am: 4d34eb2c7a am: aaddfd88e9 am: e20f52a05a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726247

Change-Id: I2bcd0934af1e0e4d6679e04293f04bbebcadab4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-28 18:44:07 +00:00
Grace Cheng
60f4e180a2 [automerger skipped] Merge "Fix NPE in updateAddPreference" into udc-dev am: 25b489e212 am: f73f073643 -s ours
am skip reason: Merged-In Id7edde492168b467360c6c99b326721cd883bba8 with SHA-1 2365ad895a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23667755

Change-Id: I6581685284601d4ee82c4585a922092c17e12856
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-28 18:41:14 +00:00
Grace Cheng
d7e397e97c [automerger skipped] Merge "Fix NPE in updateAddPreference" into udc-dev am: 25b489e212 -s ours
am skip reason: Merged-In Id7edde492168b467360c6c99b326721cd883bba8 with SHA-1 2365ad895a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23667755

Change-Id: I76d59e589e5f8882f2872da723dc20975ea60a1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-28 18:40:15 +00:00
Grace Cheng
0dcfdacc25 [automerger skipped] Fix NPE in updateAddPreference am: f58714496a -s ours
am skip reason: Merged-In Id7edde492168b467360c6c99b326721cd883bba8 with SHA-1 2365ad895a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23667755

Change-Id: Ie5120e61d7df71adf77970088a3be7334ed6a4f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-28 18:40:12 +00:00
Matías Hernández
63a50999f5 Merge "Settings: don't try to allow NLSes with too-long component names" into udc-dev am: 4d34eb2c7a am: 0d21526217
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726247

Change-Id: I66d6a9ce28f475dfb2d130bcaccdc3d2c6b8623d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-28 18:39:45 +00:00
Matías Hernández
e20f52a05a Merge "Settings: don't try to allow NLSes with too-long component names" into udc-dev am: 4d34eb2c7a am: aaddfd88e9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726247

Change-Id: I8fc3a7b239ce0545b34eafc860df72a42cfd2e05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-28 18:39:16 +00:00
Grace Cheng
f73f073643 Merge "Fix NPE in updateAddPreference" into udc-dev am: 25b489e212
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23667755

Change-Id: I691796e372f65ffec44954a850d462f796c19f82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-28 18:36:58 +00:00
Matías Hernández
9feb898da7 Merge "Settings: don't try to allow NLSes with too-long component names" into udc-dev am: 4d34eb2c7a am: aaddfd88e9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726247

Change-Id: I0f6901ca11f07090c15146dac2b0b39c67db8eb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-28 18:35:52 +00:00
Grace Cheng
25b489e212 Merge "Fix NPE in updateAddPreference" into udc-dev 2023-06-28 17:41:13 +00:00
Matías Hernández
aaddfd88e9 Merge "Settings: don't try to allow NLSes with too-long component names" into udc-dev am: 4d34eb2c7a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726247

Change-Id: If35fbb5c16a642b56de29012ce43ecd7f068d5b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-28 17:14:55 +00:00
Matías Hernández
0d21526217 Merge "Settings: don't try to allow NLSes with too-long component names" into udc-dev am: 4d34eb2c7a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726247

Change-Id: I1e1dbbdf2b1834da763835c1bbcd263cdb27eb09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-28 17:10:34 +00:00
Matías Hernández
4d34eb2c7a Merge "Settings: don't try to allow NLSes with too-long component names" into udc-dev 2023-06-28 16:42:13 +00:00
Joshua McCloskey
2f46489926 Moving FingerprintSettings to Kotlin
This change is the first of many, it will

1. Change java -> kotlin
2. Use the MVVM architecture
3. Be feature flagged

This change in particular is focused on transitions to and from various activities.

Enable feature via
adb shell setprop sys.fflag.override.settings_biometrics2_fingerprint true

Bug: 280862076
Test: atest FingerprintSettingsViewModelTest
Change-Id: I8eb5c30e6f2e92c256ae7c257a9d560439ba418f
Merged-In: I8eb5c30e6f2e92c256ae7c257a9d560439ba418f
2023-06-28 15:49:02 +00:00
SongFerng Wang
c123b2e5a8 Revert "Update the wording for LE Audio"
This reverts commit f4c5c8ef5e.

Reason for revert: at stage3, removing this summary.
Bug: 289184862
Change-Id: I6b18a7e2dee9d8fcfb331e53d7a57cc43574da54
2023-06-28 10:06:59 +00:00
Zoey Chen
ab029e44f5 [Regional Preference] Add content descripiton to the img for Talkback
Test: manual
Bug: 289176529
Change-Id: Iaa7e6d8fca1036be58ea5bb17e722935f5f9f424
2023-06-28 08:31:12 +00:00
Shawn Lin
a2e032bb8e Fix lock pattern is truncated during SUW in folded state
Remove the bottom margin of the header view.

Bug: 285290323
Test: 1. Go through SUW
      2. Select lock pattern
      3. Check if UI truncated
Test: m RunSettingsRoboTests ROBOTEST_FILTER=
      com.android.settings.password.SetupChooseLockPatternTest
Change-Id: I48ac3d897e6b876bd7a1c325cc4a5e797e140da2
2023-06-28 06:52:40 +00:00
Treehugger Robot
fac986e071 Merge "[Panlingual] Add metric in Languages" into udc-qpr-dev am: 6b01e66545
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23783056

Change-Id: I15eb02f35ba2bad14edd6ef00374216aa8b5b4d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-27 18:07:37 +00:00
Hao Dong
7b99d92464 Fix pattern rotation header text.
Bug: 278055194
Test: atest ChooseLockPatternTest
Change-Id: I36ec325b46d7a7f583d94dc26f9962cadc3874cd
Merged-In: I36ec325b46d7a7f583d94dc26f9962cadc3874cd
2023-06-27 17:50:15 +00:00
Hao Dong
2ca3f3232c Fix Fingerprint enrollment UI when display size is largest.
1. Remove land/udfps_enroll_enrolling and use the default land layout
instead. Swap header and content when necessary to avoid overlap.
2. Add UdfpsEnrollEnrollingView.java

Test: manual test - 1. Set system display and font size largest
	            2. Launch fingerprint enrollment and check UI.
Test: atest FingerprintEnrollEnrollingTest
Bug: 269060514
Bug: 283169056
Change-Id: Ifbe6c92c4213979952f2f89a1cd595c9c4bff6ec
Merged-In: Ifbe6c92c4213979952f2f89a1cd595c9c4bff6ec
2023-06-27 17:48:16 +00:00
Michael Mikhail
7c9958aafd Trigger talkback for notification volume change
Triggers talkback to say the content description of the title of
notification volume when notification volume is set to vibrate or silent
mode.

Fixes: 285453719
Fixes: 285455826
Test: manually checked when the ring volume is set to 0% and when the
notification volume is set to 0%. Check the video in the bug link.

Change-Id: I4bd65bdbfa41793fc8e32c295185363ca36cc0d7
2023-06-27 17:42:11 +00:00
Treehugger Robot
6b01e66545 Merge "[Panlingual] Add metric in Languages" into udc-qpr-dev 2023-06-27 17:35:26 +00:00
Michael Mikhail
2f393303c9 Add content description to volume title in settings.
Adds content description that is announced by talkback when a11y focus
is on volume preference. This improves talkback announcement when view changes.

Fixes: 285529113
Bug: 285455826
Fixes: 285487766
Test: atest VolumeSeekBarPreferenceControllerTest
Test: atest VolumeSeekBarPreferenceTest
Change-Id: Ibe80b4b1d489dc058df1cc79c96b034d5ddc6e56
2023-06-27 17:32:01 +00:00
Michael Mikhail
6308e3fb2a Trigger talkback for notification volume change
Triggers talkback to say the content description of the title of
notification volume when notification volume is set to vibrate or silent
mode.

Fixes: 285453719
Fixes: 285455826
Test: manually checked when the ring volume is set to 0% and when the
notification volume is set to 0%. Check the video in the bug link.

Change-Id: I4bd65bdbfa41793fc8e32c295185363ca36cc0d7
2023-06-27 17:01:18 +00:00
Zoey Chen
dab8f53e9b [Panlingual] Add metric in Languages
Bug: 279915462
Test: manual
Change-Id: I12dc7f8a0c594de88790e116c4b4f7ca9dc7253e
2023-06-27 15:40:36 +00:00
Vania Januar
4c281ab191 Merge "Clarify that enabling Notes role requires reboot in preference summary" into udc-qpr-dev am: 0e8bdf2fc0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23766165

Change-Id: I5937c756289f04916f366ec0acba6866b422ac50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-27 15:00:48 +00:00
Vania Januar
0e8bdf2fc0 Merge "Clarify that enabling Notes role requires reboot in preference summary" into udc-qpr-dev 2023-06-27 14:14:58 +00:00
Yasin Kilicdere
2d3fed86d1 After deleting guest user, switch back to previous instead of user0.
In Setting, after deleting or exiting the guest user, or failure to
reset the guest user involves switching back to user0, which is not
possible with HSUM (headless system user mode). With this CL we're
now switching back to previous foreground user instead of system user.

Bug: 283106632
Test: manual
Change-Id: Id60063cca75d9fded7dfe0b7d7a4b871d67c4b0c
2023-06-27 12:59:16 +01:00
Treehugger Robot
650a7e9298 Merge "Correct Factory Reset activity protect permission" into udc-qpr-dev am: dd3e338823
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467970

Change-Id: If91f7efe15ef7fffda7a87ab6a8c188ab2a404be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-27 08:58:05 +00:00
Treehugger Robot
dd3e338823 Merge "Correct Factory Reset activity protect permission" into udc-qpr-dev 2023-06-27 08:46:50 +00:00
Edgar Wang
88659e80d9 Correct used size of Storage Settings. am: e52320e755
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23483884

Change-Id: I4816569a8c5bee277121f15397adf7167ec944e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-27 08:35:31 +00:00
Xin Li
7a4625239f [automerger skipped] Merge "Merge Android 13 QPR3" am: 65c31baf7f -s ours am: c61819e807 -s ours am: 164acf327a -s ours am: bcc898dbed -s ours am: e849e3a643 -s ours
am skip reason: Merged-In I11e6110ba0b640be8b373d9afd45f806c005b05f with SHA-1 45918b72bf is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2635192

Change-Id: I190dc6e845ee9574e822ab9c357ed16282da8aa2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-27 07:27:29 +00:00
Xin Li
96633fda9a [automerger skipped] Merge Android 13 QPR3 am: 3e6b213e75 -s ours am: ba9cb49565 -s ours am: e7ba843385 -s ours am: 8244a2aeb4 -s ours am: c9bfd995a9 -s ours
am skip reason: Merged-In I11e6110ba0b640be8b373d9afd45f806c005b05f with SHA-1 45918b72bf is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2635192

Change-Id: I2ddc767f85a91245866149964e541c4313f026f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-27 07:25:45 +00:00
Edgar Wang
e52320e755 Correct used size of Storage Settings.
Since StorageManager rounded the totalBytes of device storage but
they don't do that rounding for freeBytes.
So in some cases the freeBytes can be greater than totalBytes.

We propose to get totalBytes of device storage directly to calculate
correct privateUsedBytes.

Test: robotest
Bug: 281955532
Change-Id: I4f137c20e7c2f54f4e037d50e81b3176edc1a83a
2023-06-27 06:29:00 +00:00
TreeHugger Robot
f703764efd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 85a90ef00b -s ours am: 60f8d67f1d -s ours am: 48fa611907 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23788721

Change-Id: I7083cb39af52fa39087d7735db2c7b3cd45cede5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-27 05:58:20 +00:00
Bill Yi
d6d923c325 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 374a3112e3 -s ours am: 6cb8b3b00c -s ours am: f44874ca83 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23788721

Change-Id: I56d347d8ef8a3076de90d6ab4c39c332b7d364a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-27 05:58:17 +00:00
Bill Yi
e8993b5116 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e2abc0ab7a -s ours am: 392e63d166 -s ours am: e4a787f1f0 -s ours am: dac919f41a -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23789283

Change-Id: I2ecd960decf8b10f7505f7625bb24d4ca6745bde
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-27 05:57:14 +00:00
Hao Dong
ae04426d02 Merge "Wait for systemui udfps overlay ready to show settings udfps enroll view. am: be823bc598" into udc-qpr-dev am: 0df79b1ccc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23814463

Change-Id: I364fb2e57fccd35f15a4adb61918ac2a8568ff9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-27 05:54:11 +00:00