PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
130,275 Commits 1 Branch 0 Tags
34f33209555b7f5894e17b267b17db83aa48d09e
Commit Graph

130275 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Oli Thompson
5435412488 Merge "Fix emergency button not visible on pattern work challenge screen" into udc-dev am: 01b382546e am: 86f36a032f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23631338

Change-Id: I04aa1bd70bcec3e1ed275dc27eff3c58a9c51c6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 17:03:21 +00:00
Mady Mellor
50cacfcc1e Merge "Update the colors for bubbles settings based on new spec" into udc-dev am: 57406435cf am: 0399987aa1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23622468

Change-Id: I55c42684f0af8cbcc8550d0b2491b7b132ab490d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 17:03:03 +00:00
Oli Thompson
f35b1be8ac Merge "Fix emergency button not visible on pattern work challenge screen" into udc-dev am: 01b382546e am: e86146d685 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23631338

Change-Id: I82b44ce36153a64d37629f40dc8c7805c17847a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 17:02:43 +00:00
Mady Mellor
ebfa483008 Merge "Update the colors for bubbles settings based on new spec" into udc-dev am: 57406435cf am: d219333161 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23622468

Change-Id: I9e9b9fb1e07d65903b7e5482d1068df3fff5b5f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 17:00:25 +00:00
Oli Thompson
e20d5d34f8 Merge "Fix emergency button not visible on pattern work challenge screen" into udc-dev am: 01b382546e am: 03bd83270a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23631338

Change-Id: I8f3631be2dc924fe8cf61278ccc6c2b9547c1629
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 16:59:57 +00:00
Mady Mellor
f55de6cdd1 Merge "Update the colors for bubbles settings based on new spec" into udc-dev am: 57406435cf am: 0399987aa1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23622468

Change-Id: I9b9c6a097b60c2a08c5f69b6b3c02beb73bbeb9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 16:59:18 +00:00
Oli Thompson
ca697c000a Merge "Fix emergency button not visible on pattern work challenge screen" into udc-dev am: 01b382546e am: e86146d685 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23631338

Change-Id: Ifcde9f0a8fc75fc01909771df880f2b6ee70dab9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 16:58:49 +00:00
Mady Mellor
d219333161 Merge "Update the colors for bubbles settings based on new spec" into udc-dev am: 57406435cf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23622468

Change-Id: Icd172f86a9893c0733b5ed5791c7e7017dd227d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 16:17:58 +00:00
Mady Mellor
e31798fc60 Merge "Update the colors for bubbles settings based on new spec" into udc-dev am: 57406435cf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23622468

Change-Id: I734a2ace8bb83ff2b0740a954c9660806968407d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 16:17:46 +00:00
Mady Mellor
0399987aa1 Merge "Update the colors for bubbles settings based on new spec" into udc-dev am: 57406435cf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23622468

Change-Id: I9ba9a9b9a7fb9ba79d5b3f28a4627f28937eb7ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 16:17:46 +00:00
Oli Thompson
03bd83270a Merge "Fix emergency button not visible on pattern work challenge screen" into udc-dev am: 01b382546e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23631338

Change-Id: If1f8a496fc6fec8419619d9c399bddb21bfcc232
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 16:17:41 +00:00
Oli Thompson
e86146d685 Merge "Fix emergency button not visible on pattern work challenge screen" into udc-dev am: 01b382546e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23631338

Change-Id: I7aa48065cbc087ff4135a93983e3b32b97dc6204
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 16:16:59 +00:00
Oli Thompson
b6ee871b16 Merge "Fix emergency button not visible on pattern work challenge screen" into udc-dev am: 01b382546e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23631338

Change-Id: I74c34ff1cf7ad6fccdf43b2c1faf1dbcff723327
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 16:16:45 +00:00
Mady Mellor
9db4671279 Merge "Update the colors for bubbles settings based on new spec" into udc-dev am: 57406435cf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23622468

Change-Id: I045d775faec3df27cfde23e9b52ca29574d20511
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 16:13:15 +00:00
Oli Thompson
86f36a032f Merge "Fix emergency button not visible on pattern work challenge screen" into udc-dev am: 01b382546e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23631338

Change-Id: I06044fd93191b0799858c6db9f194a222fa7fe99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 16:12:19 +00:00
Treehugger Robot
631ad30cd2 Merge "Import translations. DO NOT MERGE ANYWHERE" 2023-06-09 15:34:11 +00:00
Mady Mellor
57406435cf Merge "Update the colors for bubbles settings based on new spec" into udc-dev 2023-06-09 15:33:30 +00:00
Bill Yi
eb097a551c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1b5824f6c9 -s ours am: 0a31322199 -s ours am: 6d544022c3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9ea2b738ba0e87174edcf505d93f37c0149e0c97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 15:33:00 +00:00
Justin Gross
fd4368da65 Merge "Enable vendors to add preference controllers in mobile network settings" into udc-dev am: 89e829e3dc am: e114e83b59 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23324419

Change-Id: Ic6b631872248702be2953a664ac9d41912745e0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 15:32:48 +00:00
TreeHugger Robot
8c609eb6ec Merge "Restrict SimDialogActivity" into udc-dev am: 25d24e0cf0 am: cd51494303 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23466978

Change-Id: Ice7e3ce80079eb625d1f12e12b8a9fc45b567094
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 15:32:18 +00:00
Jason Chiu
6acd8f47dc Merge "Do not init dashboard categories when SetupWizard isn't finished yet" into udc-dev am: b2ed35b2ae am: d46621351b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23486247

Change-Id: I82844776192cd127ec9aa84d5bf35e0e7b7c8e8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 15:32:10 +00:00
Chaohui Wang
06ec4161f4 Merge "Hide Show System on SPA version App languages" into udc-dev am: 122ba16792 am: 563d1c4d80 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23486250

Change-Id: I21cea9c10d9d1115678fa54a74f1c15e6e5ca104
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 15:31:28 +00:00
Oli Thompson
01b382546e Merge "Fix emergency button not visible on pattern work challenge screen" into udc-dev 2023-06-09 15:31:17 +00:00
Chaohui Wang
1f39ea15d1 Merge "Fix padding issue on Scan QR code screen" into udc-dev am: 68995792c2 am: 897224a971 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23484426

Change-Id: I9d41b50505a7effaa790613aaa6932e044ef93dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 15:12:26 +00:00
Treehugger Robot
d2239ad487 Merge "Skip Wi-Fi hotspot in Settings Widgets" into udc-dev am: 47d3cfe635 am: 3880a3847d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23517077

Change-Id: I32817a14fc17385c6b29e921e6b9c97436d5081f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 15:12:18 +00:00
Yanli Wan
58d06aeda3 Merge "Update the string of Settings preference for device lock" into udc-dev am: 7cc3625678 am: 5201313232 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23522457

Change-Id: I7159fa5c5e80ddef9f00be87c0692a3a6b086a8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 15:12:09 +00:00
TreeHugger Robot
6701bfd3af [automerger skipped] Merge "Set textDirection=locale and layoutDirection=locale for alert dialog" into udc-dev am: 641d07244e am: 7516343eee -s ours 
am skip reason: Merged-In I0dfa0da22e70d267d8d8ed8e9c5be3d6db107841 with SHA-1 7a8602dce9 is already in history

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

Change-Id: I82ea41c458af214bd1fbe0bd32d59259279c83a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 15:12:01 +00:00
YK Hung
e50861b5d4 Merge "Update incompatible charger checking rule" into udc-dev am: bfc4637d09 am: e246dbe11a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23484351

Change-Id: Ieb4684057559717e6a5d442b8aa39fcab75f4d92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 15:11:35 +00:00
Pavel Grafov
a1f6bfc093 Merge "Avoid double quiet mode requests" into udc-dev am: 8e13abebc0 am: 43d5beba8a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23489320

Change-Id: If042fc52246d684196212797fe80e3b68da41f47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 15:04:25 +00:00
TreeHugger Robot
402662a72f Merge "Fix TetherSettings crash issue" into udc-dev am: f65da39f37 am: 4e033ea941 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23485222

Change-Id: I3af8304767588b439313ac064ae923b240497590
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 15:04:16 +00:00
TreeHugger Robot
4a84ea4078 Merge "Add more search terms for WPP" into udc-dev am: 2484fa72d6 am: b0a1914a61 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23436100

Change-Id: I93c7c5db8526b1a711cca2da9f82e1fcfc8baf07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 15:04:06 +00:00
TreeHugger Robot
ce44c44732 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 672ba73070 -s ours am: d26db6ce5a -s ours am: 3287804cff -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I73693d7d7a49c9714ab0b3f80ae33b3948823164
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 13:18:25 +00:00
Bill Yi
e5a111a2f6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cd3e51654c -s ours am: 16f5f3cf3d -s ours am: 2f4295175e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I388faee8c4191807687b5fee3696fd8af2aebedc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 13:18:22 +00:00
Bill Yi
31f7ff7dd5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e9d26cfdce -s ours am: 58162acd2e -s ours am: 15a8260049 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I531842b9948dd851d6d2f49b3e88ea6e5845f329
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 13:14:49 +00:00
TreeHugger Robot
6e34a709b2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 34ee142399 -s ours am: 53a315463c -s ours am: 62b096f9c8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6f06e286cd4bc8eff657d04fa6faeb19e97255ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 13:14:12 +00:00
Bill Yi
404c97ac6f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f97401447 -s ours am: 5b8058c497 -s ours am: 1544c1904d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I000af691de908fed3a4c8981f9285142fc2cd3da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 13:14:10 +00:00
Oli Thompson
dcce8fa662 Fix emergency button not visible on pattern work challenge screen 
Hide the subtext for work challenge pattern,so everything fits and
adjust some spacing

Test: btest a.d.g.WorkTelephonyTest#workChallengePatternScreen_whenAllSubscriptionsManaged_hasEmergencyButton -nm
Bug: 283137301
Bug: 286391641
Change-Id: Ia6214b624f8d7328f7445f01a08166b8ab33fdec
 2023-06-09 13:06:39 +00:00
Bill Yi
bcec2e6113 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: adefb73221 -s ours am: 3365a09592 -s ours am: 67c8d90a01 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I084eeaefaa88577e7ed76c8818ef897d8fa805dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 12:35:54 +00:00
Zaiyue Xue
63ad222c02 Don't load battery entry name and icon in offline job to improve memory usage. am: 65cb6ef230 am: dff1bd58de am: de151e008b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23629343

Change-Id: Iceb38fbf36b32674346d0dcf52521cfe4058b5b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 12:31:53 +00:00
Automerger Merge Worker
d4130808df Merge "Don't load battery entry name and icon in offline job to improve memory usage. am: 65cb6ef230 am: 44fcc61baf am: c19305590c" 2023-06-09 12:31:38 +00:00
Zaiyue Xue
ed66e21cba Don't load battery entry name and icon in offline job to improve memory usage. am: 65cb6ef230 am: 44fcc61baf am: c19305590c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23629343

Change-Id: I6691f8ac01ec53f8de1fd4b9c69055660a48ce32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 12:31:34 +00:00
TreeHugger Robot
9df5a43674 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 6834cfffe4 -s ours am: 0780dfa949 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I66b970ef5aec59b68f30fb255d1de57f2686fde8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 12:31:12 +00:00
Bill Yi
2a72ec0f4c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b57ebe9c3b -s ours am: 55d50df359 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I47140fb3ff0e6d939bf236f9651775157921f1d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 12:31:10 +00:00
TreeHugger Robot
5069d26f1a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: c2a92b394e -s ours am: 81821b6bb1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3a68dace662807f6bb134da6fc1f26d0c3813330
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 12:31:08 +00:00
Bill Yi
ff4bb2c6e2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2bcb8c25fd -s ours am: f100547011 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9fc88efd93b8cef73335302714b4d868ec884ff6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 12:30:43 +00:00
TreeHugger Robot
a53257ae9d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: fef0572018 -s ours am: 7f378bea3a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I740d2bd037ec7a046bf0544ddfca8cf42f6af518
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 12:30:24 +00:00
Bill Yi
e9b24d5299 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e841794da4 -s ours am: 599b4acb22 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ied16908371e42118f0976c8b84f552c017441955
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 12:30:06 +00:00
Zaiyue Xue
de151e008b Don't load battery entry name and icon in offline job to improve memory usage. am: 65cb6ef230 am: dff1bd58de 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23629343

Change-Id: Id0a5a896ec8e8203204714249f4c9d756eb7cbd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 11:46:16 +00:00
Zaiyue Xue
c19305590c Don't load battery entry name and icon in offline job to improve memory usage. am: 65cb6ef230 am: 44fcc61baf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23629343

Change-Id: I3364f31694053b7c19b99eb9d305f8b4cb9b225c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 11:43:55 +00:00
Zaiyue Xue
dff1bd58de Don't load battery entry name and icon in offline job to improve memory usage. am: 65cb6ef230 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23629343

Change-Id: I07e697bb37a2c3655b7e5b6e5177c8d9d9059f71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 11:01:47 +00:00