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

122220 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitry Dementyev
335ceeb84a Merge "Use updated lockscreen validation API in Settings." 2023-03-21 19:22:49 +00:00
lbill
c7dd729a43 Launch Face Settings when device enrolled face 
In legacy flow FaceEnrollIntroduction check maxFacesEnrolled()
then update introduction description and prevent user go to next
enroll step, the CUJ was not good to user, instead bring user
to Face Settings and let user decide the next action(Delete face or
change config) is more make sense.

As any applications could broadcast intent(android.settings.FACE_ENROLL)
to bring FaceEnrollIntroduction up, we add a check in onCreate() and check
if device has been enrolled max face, launch FaceSettingsInternalActivity.

In addition, skip to register any posture change callback when
maxFacesEnrolled() during activity onStart().

Test: atest SettingsGoogleUnitTests
Test: m -j SettingsGoogleRoboTests RunSettingsGoogleRoboTests
Test: m RunSettingsRoboTests ROBOTEST_FILTER= \
      "FaceEnrollIntroductionTest"
Test: m RunSettingsRoboTests ROBOTEST_FILTER= \
      "FingerprintEnrollIntroductionTest"
Test: Manual enrolled face, unfold device, launch Tips Security page
and click "Set up Face Unlock", device launch Face Settings insteand of
posture guidance page.

Bug: 263830403
Change-Id: Ied8b92259810f954ce6b2daaa9b87fc996ad752a
 2023-03-21 19:10:57 +00:00
Sally Yuen
877a6ffa82 Merge "Update Extra dim banner for tablets" into tm-qpr-dev am: 6d6736c1c9 am: 1795481a72 am: 40019f876b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22076421

Change-Id: I907ff8fc461c9fb9c2965e2c30dc6721cc3c09a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-21 19:08:40 +00:00
Sally Yuen
f464edf6dc Merge "Update Extra dim banner for tablets" into tm-qpr-dev am: 6d6736c1c9 am: 1795481a72 am: 40019f876b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22076421

Change-Id: I54c8118e05f1c17662bac7eb5260aaa544b3b7f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-21 19:04:37 +00:00
Sally Yuen
40019f876b Merge "Update Extra dim banner for tablets" into tm-qpr-dev am: 6d6736c1c9 am: 1795481a72 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22076421

Change-Id: Ib68b4ee9ecbd90f565eb57ceed0e8d2eb445864a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-21 18:24:43 +00:00
Sally Yuen
1795481a72 Merge "Update Extra dim banner for tablets" into tm-qpr-dev am: 6d6736c1c9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22076421

Change-Id: I781c0e19683127e794d63949979b1b5a2eb2ff4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-21 17:46:07 +00:00
Sally Yuen
6d6736c1c9 Merge "Update Extra dim banner for tablets" into tm-qpr-dev 2023-03-21 16:33:06 +00:00
Becca Hughes
a917128931 Merge "Add settings intent dialog" 2023-03-21 15:58:37 +00:00
Jason Hsu
0effae9185 Merge "Update the strings for bluetooth hearing device details page in U" into udc-dev am: bff222ca71 am: 5413c0269c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22164162

Change-Id: Iab4e555c3c22716a35f0c727079e453240530f40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-21 13:37:36 +00:00
Jason Hsu
61d3f30778 Merge "Update the strings for bluetooth hearing device details page in U" into udc-dev am: bff222ca71 am: 8f565dda10 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22164162

Change-Id: I83118568c17545571bbbcc4ec6a5d7344798e16a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-21 13:36:36 +00:00
Jason Hsu
78a1cd282d Merge "Update to use android:summary="%s" in ListPreference" into udc-dev am: b25a941609 am: e5ce1ad6e1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22162143

Change-Id: Ib224dcec4ec14f8131d5bce436e5940d35907ba9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-21 13:34:54 +00:00
Jason Hsu
c6cb39b965 Merge "Update to use android:summary="%s" in ListPreference" into udc-dev am: b25a941609 am: fff9b76baf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22162143

Change-Id: I102f8f24c8dfbebae6a1751cc8ca23fd04d6dd6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-21 13:33:27 +00:00
Jason Hsu
8f565dda10 Merge "Update the strings for bluetooth hearing device details page in U" into udc-dev am: bff222ca71 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22164162

Change-Id: I3bfe7886f3dee0407faa357cb3cae58e1914ee9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-21 13:00:04 +00:00
Jason Hsu
5413c0269c Merge "Update the strings for bluetooth hearing device details page in U" into udc-dev am: bff222ca71 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22164162

Change-Id: I56b833f5f55d67bbb99db68d7ede97e0ee21873d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-21 12:59:42 +00:00
Jason Hsu
fff9b76baf Merge "Update to use android:summary="%s" in ListPreference" into udc-dev am: b25a941609 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22162143

Change-Id: Id654d152809446154b53faa7d84010e650b3b08c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-21 12:57:18 +00:00
Jason Hsu
e5ce1ad6e1 Merge "Update to use android:summary="%s" in ListPreference" into udc-dev am: b25a941609 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22162143

Change-Id: If14fcbfa4efa74e7551d192891033fe71ba1e371
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-21 12:57:08 +00:00
Jason Hsu
bff222ca71 Merge "Update the strings for bluetooth hearing device details page in U" into udc-dev 2023-03-21 11:39:44 +00:00
Jason Hsu
b25a941609 Merge "Update to use android:summary="%s" in ListPreference" into udc-dev 2023-03-21 11:38:02 +00:00
Josh Hou
7076cbc015 [Panlingual] Can't set per-app languages for apps on work profile page 
Use startActivityAsUser instead of startActivity API to start the AppLocalePickerActivity of different users

Bug: 274378136
Test: 1. Perform AppLocalePickerActivityTest robolectric test
      2. Perform the manual test by switching different users
      3. Perform the manual test by switching different profiles
Change-Id: I0dfc40b29a7a35f18f6bcffd22fb421c6ad9c230
Merged-In: I4405b3b7e832b71b9ef66fa71d9e42ce12da167c
 2023-03-21 11:03:27 +00:00
Josh Hou
38df174bba [Panlingual] Can't set per-app languages for apps on work profile page 
Use startActivityAsUser instead of startActivity API to start the AppLocalePickerActivity of different users

Bug: 274378136
Test: 1. Perform AppLocalePickerActivityTest robolectric test
      2. Perform the manual test by switching different users
      3. Perform the manual test by switching different profiles
Change-Id: I4405b3b7e832b71b9ef66fa71d9e42ce12da167c
 2023-03-21 10:57:42 +00:00
Matías Hernández
07394b0fdc Fix icons of DND timelapse/event schedule types in Dark Mode 
Instead of a fixed white color, use a theme-dependent one. Also renamed the drawables themselves since they are no longer "_white".

Fixes: 214789556
Test: Manual
Change-Id: I94d7d0308a339385988d3bb39182b2e2d2f0c3a1
 2023-03-21 11:56:16 +01:00
Angela Wang
79e850c4d9 Merge "Adds illustration to Flash Notifications settings page" into udc-dev am: 6dfcad2cb2 am: 4b43e0b716 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22164175

Change-Id: I97a589a397602668a61429fd938e0bdfa0b85014
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-21 10:03:05 +00:00
Angela Wang
7d89d19dbd Merge "Adds illustration to Flash Notifications settings page" into udc-dev am: 6dfcad2cb2 am: 2b1e10e613 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22164175

Change-Id: Ia6b1cd4d5f989281e02635d07374b502084089df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-21 10:00:59 +00:00
Angela Wang
4b43e0b716 Merge "Adds illustration to Flash Notifications settings page" into udc-dev am: 6dfcad2cb2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22164175

Change-Id: Ic88a092c01d1f0441615287485d5e0f4aef85c68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-21 09:27:18 +00:00
Angela Wang
2b1e10e613 Merge "Adds illustration to Flash Notifications settings page" into udc-dev am: 6dfcad2cb2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22164175

Change-Id: I6fb33eaa0cb8768c0a9fa123ee3c951d68456cdf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-21 09:26:28 +00:00
Angela Wang
6dfcad2cb2 Merge "Adds illustration to Flash Notifications settings page" into udc-dev 2023-03-21 08:44:04 +00:00
jasonwshsu
fd76efc7fd Update the strings for bluetooth hearing device details page in U 
Bug: 270086620
Test: flash rom and check the device details page UI for hearing device
Change-Id: Iae1a7fae9f51ed8318d757ed7b3eefe0261b28a1
 2023-03-21 15:10:38 +08:00
Ahan Wu
ae84ac3530 Use GlifLayout#setDescriptionText in SetupChooseLockGenericFragment 
1. Use GlifLayout#setDescriptionText to align UX.
2. Remove redundant layout resources.
3. Add two new robotests.

Bug: 236948821
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SetupChooseLockGenericTest
Test: Check UI manually
Change-Id: I85cc984527fcc746e835d8fa508e78c96dfdcb94
 2023-03-21 06:27:51 +00:00
Angela Wang
139ee5037b Adds illustration to Flash Notifications settings page 
Bug: 274546785
Test: builds and checks the illustration manually
Change-Id: Iaaa49195fc062b2905b148352a5bd3e25807f207
 2023-03-21 05:11:45 +00:00
Kweku Adams
cefae4bddd Merge "Remove RESTRICTED bucket off code." into udc-dev am: f0c3812123 am: 8b735f191b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22075586

Change-Id: I2cbd9653446619b1d037f2c19654fd08dea89441
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-21 00:50:14 +00:00
Chaohui Wang
6d9138a9dd Merge "Fix not displaying "Allow restricted settings"" into udc-dev am: ac67b77af7 am: 37e0f3fc17 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22135265

Change-Id: Ifbd6a72f5efeeedca6137fc3199cd9656298a5a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-21 00:45:36 +00:00
Becca Hughes
a983d78b71 [automerger skipped] Merge "Add subtitle to settings (settings)" into udc-dev am: 853c4a8683 am: 79fb783267 -s ours 
am skip reason: Merged-In I481da16985027a49ee464623b6db166d941cab55 with SHA-1 fb4488ea83 is already in history

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

Change-Id: I999ece810834d51a1c80346ab97c149353fb7cb9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-21 00:43:45 +00:00
Zoey Chen
37152c6d03 Merge changes I26c7d64e,I7ec6d824 into udc-dev am: 1c47f309af am: 3feb199021 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22120466

Change-Id: I0cc20af23592faac2739f11c776112d0a3ff5dbe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-21 00:30:27 +00:00
Becca Hughes
9d74509888 Add settings intent dialog 
Add a dialog that can be launched via
an intent to prompt the user to enable
the provider for credman.

Test: make & atest & manual
Bug: 267816998
Change-Id: Id88cc7b3bf2829d075fbba87ea5dc0a245b9ae32
 2023-03-21 00:00:40 +00:00
Julia Reynolds
53b196e4fe Merge "Add missing conversation field" into udc-dev am: 2494fd0187 am: 78dbfb94aa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22118257

Change-Id: Ia4a7f7bad1b3d07244456eada807973394c0c911
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-21 00:00:26 +00:00
Betty Chang
1ad8ad8512 [automerger skipped] Merge "[LE Audio] Set activity for result after scanning the QR code" am: 9541363952 am: 00a7d0788f am: aa7ec2d5fe -s ours am: 8170de078c -s ours am: 79932802dc -s ours 
am skip reason: Merged-In Ia252f29ad9dfdc09266e91cc9ecaa32ed8c749c2 with SHA-1 74dc069d16 is already in history

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

Change-Id: Ibb32cb73ae5c7b22997cd8db91a1e6f3932ed59f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-20 23:42:50 +00:00
Zoey Chen
0303294ec1 Merge "[Settings] Should not show WFC UI in the SIM page if the SIM does not support WFC" into udc-dev am: 7a492b4098 am: 3066760ea9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22135681

Change-Id: I97607cec2c308dbacc8949be28652231bd316e89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-20 23:42:30 +00:00
SongFerng Wang
be91ce571a Merge "Modify the log at AutoSelectPreferenceController" into udc-dev am: d687c01745 am: fa582a311f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22122899

Change-Id: I64cd5610c4689c1521adbef6e70b7b1af5da58dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-20 23:42:20 +00:00
SongFerng Wang
5580bf69da [automerger skipped] Merge "Avoid ANR when UI query network selection state" into tm-qpr-dev am: d911a095eb am: 782bb2f069 -s ours am: 866c7e17f8 -s ours am: 953a6fec66 -s ours 
am skip reason: Merged-In I81a597f28cf7ce25ff4eff5100bdb4d29c897a14 with SHA-1 7b9c22348a is already in history

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

Change-Id: I84d15284deea2a76819d3cda060602c463a61d46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-20 23:42:10 +00:00
Betty Chang
328f4edc3a [automerger skipped] Merge "[LE Audio] To remove the broadcast source item that created by receive state" am: 18eb985e41 am: 1de44c2447 am: 0fd1625895 -s ours am: 9a40a296cc -s ours am: 2a874ed261 -s ours 
am skip reason: Merged-In I416f0a39e31276876e63360664555f99dd7297c9 with SHA-1 a6d532cdba is already in history

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

Change-Id: I8240d83db456aa533828066f12b136e0252d2bed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-20 23:42:01 +00:00
Zoey Chen
634a22b64c Merge "[Settings] Do not set text if the fragment is not attached" into udc-dev am: ce77de4240 am: eadb730164 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22142522

Change-Id: I71220da3bbed9960180034c63040a973ea2250c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-20 23:41:15 +00:00
Kweku Adams
e5659c5947 Merge "Remove RESTRICTED bucket off code." into udc-dev am: f0c3812123 am: b4240202a2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22075586

Change-Id: I0baaa5324ab6956f0eda401c49042fbbce2c7ee8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-20 23:33:47 +00:00
Chaohui Wang
5fc73ac4b0 Merge "Fix not displaying "Allow restricted settings"" into udc-dev am: ac67b77af7 am: 989a724787 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22135265

Change-Id: Ifca2b640e3963bbc365ad10e5be14db954f891ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-20 23:27:53 +00:00
Becca Hughes
5d829ccd04 [automerger skipped] Merge "Add subtitle to settings (settings)" into udc-dev am: 853c4a8683 am: 241b14fd9b -s ours 
am skip reason: Merged-In I481da16985027a49ee464623b6db166d941cab55 with SHA-1 6474e01372 is already in history

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

Change-Id: Idba1c0b6402447faf3f2913254a914d2fe4c0b3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-20 23:25:26 +00:00
Automerger Merge Worker
fb2ff9fd61 Merge changes from topic "am-17fa75bbe3d14606bc093a0b1a8af049" 
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 77b98813c3 -s ours am: 239e6fb371 -s ours am: fced4027ab -s ours am: 2b767e23c9 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 71e954c78b -s ours am: 11970fc875 -s ours am: da6f0e89d3 -s ours am: 0a1cecff05 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 5f0516e69b -s ours am: fe39800ae9 -s ours am: c0fb545e05 -s ours am: 3bd0a334f1 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 82c23db452 -s ours am: d4b4e93227 -s ours am: 28d89441e8 -s ours am: 7f7f17724b -s ours
 2023-03-20 23:24:07 +00:00
Zoey Chen
8362487a43 Merge changes I26c7d64e,I7ec6d824 into udc-dev am: 1c47f309af am: 36df8ad640 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22120466

Change-Id: I9bfd30782f84f2d2e2248220eb5165c35fce817b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-20 23:22:42 +00:00
Julia Reynolds
0ff921e245 Merge "Add missing conversation field" into udc-dev am: 2494fd0187 am: f448aec29d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22118257

Change-Id: I2832cdad7f91b61abca77691f2fbaa183b47c153
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-20 23:22:32 +00:00
Bill Yi
0e6cc0b3ae [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 77b98813c3 -s ours am: 239e6fb371 -s ours am: fced4027ab -s ours am: 2b767e23c9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I60fc00ac0181522897e20c1098c8c62058b09be6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-20 23:21:49 +00:00
Bill Yi
3679eefd6f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 71e954c78b -s ours am: 11970fc875 -s ours am: da6f0e89d3 -s ours am: 0a1cecff05 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib0dd0294fdb4510f1952e067dbdeaf388712f971
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-20 23:21:46 +00:00
Bill Yi
4c67e8d7cc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 5f0516e69b -s ours am: fe39800ae9 -s ours am: c0fb545e05 -s ours am: 3bd0a334f1 -s ours 
am skip reason: subject contains skip directive

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

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