PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
122,831 Commits 1 Branch 0 Tags
e89d58a5ed56c4ab92586d000d8ed858ab13333c
Commit Graph

122831 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
7a98911ecc Merge "Improve dialog and system dialog UI" into udc-dev am: 34947069f6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22379143

Change-Id: I173933090a0e47ce2ada298a9b8bcc6377e83275
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-31 12:16:35 +00:00
TreeHugger Robot
34947069f6 Merge "Improve dialog and system dialog UI" into udc-dev 2023-03-31 11:43:07 +00:00
Automerger Merge Worker
5bea2c5919 Merge "Merge "Rename toggle "Enable Bluetooth LE audio" to "Disable Bluetooth LE audio"" am: 60d9be5a0a am: 7871a9e9bd am: 06bca85c6a am: 486691ad26 am: d951e2a048" 2023-03-31 11:01:14 +00:00
Treehugger Robot
cb30e648a7 Merge "Rename toggle "Enable Bluetooth LE audio" to "Disable Bluetooth LE audio"" am: 60d9be5a0a am: 7871a9e9bd am: 06bca85c6a am: 486691ad26 am: d951e2a048 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2516935

Change-Id: I3bf9d1a9e9a3da1938773139ea3f70316b61bde2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-31 11:01:06 +00:00
Treehugger Robot
6684c9b6fc Merge "Rename toggle "Enable Bluetooth LE audio" to "Disable Bluetooth LE audio"" am: 60d9be5a0a am: 7871a9e9bd am: 06bca85c6a am: 486691ad26 am: e1bcb16bfb 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2516935

Change-Id: I83ed2f2a8790d7245e81f365fe6aeebbde604522
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-31 11:00:57 +00:00
Wilson Wu
da3275ca95 Merge "Fix wrong user in personal profile" into udc-dev am: ce7ad1f8a0 am: a19f80aab8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22307474

Change-Id: Icce247b416591458f7d5ee459da4b9733c465df8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-31 11:00:13 +00:00
Wilson Wu
7dc217f8f6 Merge "Fix wrong user in personal profile" into udc-dev am: ce7ad1f8a0 am: 4d91298836 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22307474

Change-Id: I6d5913765e265161918fc77b28b0da07ff128981
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-31 10:59:57 +00:00
Marcelo Arteiro
c5631b45b2 Automated Token Alignment Android/Material 
Resubmiting reverted CL Ia1f84669090e04b3a2aaac82bb5971032d74a125.
Reson: Bug was found in another CL (in this topic)

Test: Treehugger
Bug: 268682423

Change-Id: I0fead8915b2bb6281e29b32f7426c35b0138b10e
 2023-03-31 10:53:24 +00:00
Treehugger Robot
e1bcb16bfb Merge "Rename toggle "Enable Bluetooth LE audio" to "Disable Bluetooth LE audio"" am: 60d9be5a0a am: 7871a9e9bd am: 06bca85c6a am: 486691ad26 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2516935

Change-Id: I41d7ba84256d84af19fd1411645e6eb624648d9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-31 10:49:11 +00:00
Treehugger Robot
d951e2a048 Merge "Rename toggle "Enable Bluetooth LE audio" to "Disable Bluetooth LE audio"" am: 60d9be5a0a am: 7871a9e9bd am: 06bca85c6a am: 486691ad26 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2516935

Change-Id: I083eb0ad520c24c4bcf7627db7881d1872cdac5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-31 10:48:53 +00:00
Yuri Ufimtsev
f0a01200c8 Change Biometric preferences summary when not enrolled 
Test: manual
Bug: 256781166
Change-Id: I1e1bbafcf7edb0c9265f61d57b13f0858bb7700e
 2023-03-31 10:41:26 +00:00
Wilson Wu
4d91298836 Merge "Fix wrong user in personal profile" into udc-dev am: ce7ad1f8a0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22307474

Change-Id: I5e430f44894d567d42f4c1901cc0550873958cae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-31 10:33:24 +00:00
Wilson Wu
a19f80aab8 Merge "Fix wrong user in personal profile" into udc-dev am: ce7ad1f8a0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22307474

Change-Id: Ib735a7e0015c217ff1c9067c5bab3cdd1fe8cb2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-31 10:33:22 +00:00
tom hsu
7a9202587e Improve dialog and system dialog UI 
- Fix wrong subtitle on system language list.
 - Do not dismiss dialog if user touch outside of dialog.

Bug: b/276417170
Test: Manual test.

Change-Id: Ib049dc3d89e6afc7d39171ac686616cc64dae3ba
 2023-03-31 18:18:16 +08:00
Treehugger Robot
486691ad26 Merge "Rename toggle "Enable Bluetooth LE audio" to "Disable Bluetooth LE audio"" am: 60d9be5a0a am: 7871a9e9bd am: 06bca85c6a 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2516935

Change-Id: I94301fd7e273f781aa5029128d960f8b9fb1c2da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-31 10:03:11 +00:00
Wilson Wu
ce7ad1f8a0 Merge "Fix wrong user in personal profile" into udc-dev 2023-03-31 09:56:56 +00:00
Treehugger Robot
06bca85c6a Merge "Rename toggle "Enable Bluetooth LE audio" to "Disable Bluetooth LE audio"" am: 60d9be5a0a am: 7871a9e9bd 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2516935

Change-Id: I77867e2c59c5745cf8b705072e5b0b35c455f399
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-31 09:34:23 +00:00
SongFerngWang
62cc96ac05 UI add more log 
Bug: 260535339
Bug: 275754566
Test: build pass
Change-Id: I15c26d5b13f93e5a425c16174d6fbc2780c4e0a6
 2023-03-31 17:33:12 +08:00
Treehugger Robot
7871a9e9bd Merge "Rename toggle "Enable Bluetooth LE audio" to "Disable Bluetooth LE audio"" am: 60d9be5a0a 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2516935

Change-Id: I998baee786f01ee74743a02d369f8159caa89ffc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-31 09:06:29 +00:00
Treehugger Robot
60d9be5a0a Merge "Rename toggle "Enable Bluetooth LE audio" to "Disable Bluetooth LE audio"" 2023-03-31 08:20:36 +00:00
Bonian Chen
61e6c46fa7 [Settings] Avoid from user without sufficient permission to change WiFi 
calling

Enhance security control through close UI when accessing by user with
restriction.

Bug: 262390632
Bug: 262243015
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiCallingSettingsTest

Change-Id: I4fadaf2bdc55b97419f9e6abbd3cfa63af034f6a
(cherry picked from commit a1d3fe061e)
Merged-In: I4fadaf2bdc55b97419f9e6abbd3cfa63af034f6a
 2023-03-31 08:15:45 +00:00
Automerger Merge Worker
73cd21f907 Merge "Merge "Check availability on start for TetherSettings" into udc-dev am: 968dfc9c2e am: 8689460fa4" 2023-03-31 07:49:23 +00:00
Hieu Dang
a8d778a2e6 Merge "Check availability on start for TetherSettings" into udc-dev am: 968dfc9c2e am: 8689460fa4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22339270

Change-Id: I64d647342e29151e64338272e7f5ccfd7d2a564d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-31 07:49:03 +00:00
Hieu Dang
4724b122c7 Merge "Check availability on start for TetherSettings" into udc-dev am: 968dfc9c2e am: bb864d9016 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22339270

Change-Id: I76b84b4049fcc422a6ac230e40ed4e498adef466
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-31 07:48:48 +00:00
Hieu Dang
8689460fa4 Merge "Check availability on start for TetherSettings" into udc-dev am: 968dfc9c2e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22339270

Change-Id: I0d6344bd31759e32faaa98a274f7b5bf618494f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-31 07:05:55 +00:00
Hieu Dang
bb864d9016 Merge "Check availability on start for TetherSettings" into udc-dev am: 968dfc9c2e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22339270

Change-Id: I838c3a9650ac7312539137f682bbbca79431abd4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-31 07:05:42 +00:00
Hieu Dang
968dfc9c2e Merge "Check availability on start for TetherSettings" into udc-dev 2023-03-31 06:30:53 +00:00
Hao Dong
647e615d24 Merge "Post-enroll settings screen shows class 3 strings" into udc-dev am: 9ff72e4205 am: 3e2efc17c6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22314938

Change-Id: I0303b339280e1cdf416ddbed1c1e739a45ce8ba3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-31 06:03:30 +00:00
Hao Dong
f56b8bc2a4 Merge "Post-enroll settings screen shows class 3 strings" into udc-dev am: 9ff72e4205 am: 5b159df4f0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22314938

Change-Id: I2d7a6be0e98921b7adbc99646b3ebd30764bdc18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-31 06:01:03 +00:00
Hieu Dang
12fc50ca3b Check availability on start for TetherSettings 
mUnavailable variable is only assigned when creating the activity. This make the app crash when we disable tethering and then resume + toggle on the Bluetooth Tethering. This cl remove the variable and directly check whenever the app start.

Bug: 270285631
Test: manual
Change-Id: I0dff1d11cbcc06816a69985f96eee828bb83e87c
 2023-03-31 05:30:44 +00:00
Hao Dong
5b159df4f0 Merge "Post-enroll settings screen shows class 3 strings" into udc-dev am: 9ff72e4205 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22314938

Change-Id: Ic64e0e8fe81d3e881b356e60d360ff9729876faf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-31 05:19:33 +00:00
Hao Dong
3e2efc17c6 Merge "Post-enroll settings screen shows class 3 strings" into udc-dev am: 9ff72e4205 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22314938

Change-Id: I4dfa3809e0649903559d24b210666a1c2eca5856
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-31 05:19:27 +00:00
Hao Dong
9ff72e4205 Merge "Post-enroll settings screen shows class 3 strings" into udc-dev 2023-03-31 04:44:16 +00:00
Patty Huang
b79d64ee90 Rename toggle "Enable Bluetooth LE audio" to "Disable Bluetooth LE audio" 
Bug: 275388899
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothLeAudioPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothLeAudioAllowListPreferenceControllerTest
Change-Id: Ic936eb22aa4f6efd97d3a84b23a44fab83dd09a0
 2023-03-31 12:43:14 +08:00
TreeHugger Robot
3b471f0c21 [automerger skipped] Merge "[Settings] User with restriction should avoid from having entries through Settings search" into tm-qpr-dev am: 0362083f3a am: 3771564adc -s ours am: f8717edcbd -s ours am: d35e1c4426 -s ours 
am skip reason: Merged-In I63ba7f3b10fc812dd1498f17826a15e822879613 with SHA-1 5e1c4d15a9 is already in history

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

Change-Id: I28687c6d1257bcc20bfa7a783db3687c2b1100fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-31 04:17:25 +00:00
TreeHugger Robot
a0f481932b [automerger skipped] Merge "[Settings] User with restriction should avoid from having entries through Settings search" into tm-qpr-dev am: 0362083f3a am: 3771564adc -s ours am: f8717edcbd -s ours am: d98811b04b -s ours 
am skip reason: Merged-In I63ba7f3b10fc812dd1498f17826a15e822879613 with SHA-1 5e1c4d15a9 is already in history

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

Change-Id: I0cb62531d2c4bbdeca99200f9e36b2c625b50573
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-31 04:13:03 +00:00
Angela Wang
f1aed58005 Improves Settings search result of Flash Notifications 
1. Shows "Accessibility > Flash notifications" instead of "Notifications
   > Flash notifications".
2. Hides intro preference in search result.
3. Adds search keywords on Flash Notifications page entry.

Bug: 275649264
Bug: 275553435
Test: searches some queries and checks UI manually
Change-Id: Ie6616b779af77153126846748d1052fb29974e3b
 2023-03-31 03:59:09 +00:00
TreeHugger Robot
d98811b04b [automerger skipped] Merge "[Settings] User with restriction should avoid from having entries through Settings search" into tm-qpr-dev am: 0362083f3a am: 3771564adc -s ours am: f8717edcbd -s ours 
am skip reason: Merged-In I63ba7f3b10fc812dd1498f17826a15e822879613 with SHA-1 5e1c4d15a9 is already in history

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

Change-Id: I63e194734a8707cd5eed8b904e0cf7f7800580ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-31 03:33:27 +00:00
TreeHugger Robot
d35e1c4426 [automerger skipped] Merge "[Settings] User with restriction should avoid from having entries through Settings search" into tm-qpr-dev am: 0362083f3a am: 3771564adc -s ours am: f8717edcbd -s ours 
am skip reason: Merged-In I63ba7f3b10fc812dd1498f17826a15e822879613 with SHA-1 5e1c4d15a9 is already in history

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

Change-Id: I8214b8ebbd85770f9f6b0c2fe4e4f14ccf0c5423
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-31 03:28:15 +00:00
Hao Dong
b0ff672a7e Post-enroll settings screen shows class 3 strings 
Test: atest FaceSettingsFooterPreferenceControllerTest
Test: manual test
Bug: 274959218
Change-Id: I2e30666baf36a48a47e9ed9e4e046cefc805995a
 2023-03-31 03:05:57 +00:00
TreeHugger Robot
f8717edcbd [automerger skipped] Merge "[Settings] User with restriction should avoid from having entries through Settings search" into tm-qpr-dev am: 0362083f3a am: 3771564adc -s ours 
am skip reason: Merged-In I63ba7f3b10fc812dd1498f17826a15e822879613 with SHA-1 5e1c4d15a9 is already in history

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

Change-Id: Ic83c4f5c399c330f0c0d080d0e798bd7335bc7c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-31 01:58:30 +00:00
TreeHugger Robot
a3b1d11839 Merge "Restrict DataUsageList for guest user" into tm-qpr-dev am: 5bde972e4e am: f02d69dd4f am: 17e504f6a8 am: a1bd3746e6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22323478

Change-Id: Ib7761fcfe910e1116131d7868edf1f89c3416849
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-31 01:32:26 +00:00
TreeHugger Robot
3771564adc Merge "[Settings] User with restriction should avoid from having entries through Settings search" into tm-qpr-dev am: 0362083f3a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21367719

Change-Id: I54ad21af66956d5711a72f587d9af4c8389a185f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-31 01:23:13 +00:00
TreeHugger Robot
3d473b86a4 Merge "Restrict DataUsageList for guest user" into tm-qpr-dev am: 5bde972e4e am: f02d69dd4f am: 17e504f6a8 am: 15343f6585 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22323478

Change-Id: Ie8123290c29d6560ad10aa0da19573a2f28a5e71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-31 01:00:59 +00:00
TreeHugger Robot
15343f6585 Merge "Restrict DataUsageList for guest user" into tm-qpr-dev am: 5bde972e4e am: f02d69dd4f am: 17e504f6a8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22323478

Change-Id: I17c98e3c717fe86f31e19be40f660b73d6a5cce1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-31 00:56:10 +00:00
Julia Reynolds
e6cb3523f5 [automerger skipped] Don't show NLSes with excessively long component names am: 11ac41d9b6 -s ours am: 8befc27425 -s ours am: cfacc2acb8 -s ours am: 85c25d29d7 -s ours am: 684952a8b0 -s ours am: e4ce644bfe -s ours am: 2a66721ccf -s ours am: bee2aa0c8b -s ours am: 9cbd3bdb54 -s ours am: fc865d217d -s ours am: 765f392ccc -s ours 
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 79cb59e618 is already in history

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

Change-Id: Icf19550d8b9ac596aedf0211e6f0338426d37d2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-31 00:52:59 +00:00
Julia Reynolds
f0ff5a7746 [automerger skipped] Don't show NLSes with excessively long component names am: 11ac41d9b6 -s ours am: 8befc27425 -s ours am: cfacc2acb8 -s ours am: 85c25d29d7 -s ours am: 684952a8b0 -s ours am: e4ce644bfe -s ours am: 2a66721ccf -s ours am: bee2aa0c8b -s ours am: 9cbd3bdb54 -s ours am: fc865d217d -s ours am: 07fcd1f503 -s ours 
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 79cb59e618 is already in history

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

Change-Id: I70e0c6fbd099d9730092d492d8d2c68cf27f780b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-31 00:30:44 +00:00
TreeHugger Robot
0362083f3a Merge "[Settings] User with restriction should avoid from having entries through Settings search" into tm-qpr-dev 2023-03-31 00:20:15 +00:00
Julia Reynolds
765f392ccc [automerger skipped] Don't show NLSes with excessively long component names am: 11ac41d9b6 -s ours am: 8befc27425 -s ours am: cfacc2acb8 -s ours am: 85c25d29d7 -s ours am: 684952a8b0 -s ours am: e4ce644bfe -s ours am: 2a66721ccf -s ours am: bee2aa0c8b -s ours am: 9cbd3bdb54 -s ours am: fc865d217d -s ours 
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 79cb59e618 is already in history

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

Change-Id: I24d48fe50abd94b3dfb6e1df3a9a6d4a9be6a1cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-31 00:14:13 +00:00
Automerger Merge Worker
0a95552222 Merge "[automerger skipped] Don't show NLSes with excessively long component names am: 11ac41d9b6 -s ours am: 8befc27425 -s ours am: cfacc2acb8 -s ours am: 85c25d29d7 -s ours am: 684952a8b0 -s ours am: e4ce644bfe -s ours am: f445bb3b32 -s ours" into udc-dev am: d7a04c0467 -s ours am: 9595f67163 -s ours 
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 79cb59e618 is already in history

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

Change-Id: I2e0615cf6fb474f7e19be108bfe14710a9e323fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 23:55:21 +00:00