PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
121,910 Commits 1 Branch 0 Tags
c047c50bb01ef0bcb4acdaec13ed46680dbb4e9c
Commit Graph

121910 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Huang
fd695cd189 Merge "The PK settings UI should show subtype labels instead of the subtype's language names." into udc-dev am: f826b3f427 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21809546

Change-Id: I537e15066169748cc3a024383c3e164f55eb08d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 08:55:44 +00:00
Daniel Huang
91f72db16a Merge "The PK settings UI should show subtype labels instead of the subtype's language names." into udc-dev am: f826b3f427 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21809546

Change-Id: I46094521cb3171f1444b7fe8387e95e009df486f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 08:55:39 +00:00
Daniel Huang
f826b3f427 Merge "The PK settings UI should show subtype labels instead of the subtype's language names." into udc-dev 2023-03-15 08:15:07 +00:00
SongFerngWang
7b9c22348a Avoid ANR when UI query network selection state 
Moving the quert network selection state to back ground
and listening the service state to detect the betwork selection
changed.

Bug: 270652395
Test: atest AutoSelectPreferenceControllerTest
Change-Id: I81a597f28cf7ce25ff4eff5100bdb4d29c897a14
(cherry picked from commit 7b80b4ecd9)
 2023-03-15 07:54:06 +00:00
SongFerng Wang
65734dd29b Merge "Avoid ANR when UI query network selection state" 2023-03-15 07:52:59 +00:00
Jason Hsu
1ceac581de Merge "Return getMetricsCategory() for each new page hearing aid and flash notifications in android U" into udc-dev am: 7ab852b48e am: 42fc665f48 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21978662

Change-Id: I22d3b8499aec10b1d7c10f0d1fa9162698c82553
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 07:39:37 +00:00
Jason Hsu
bfd9c0e2d0 Merge "Return getMetricsCategory() for each new page hearing aid and flash notifications in android U" into udc-dev am: 7ab852b48e am: b6a359d888 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21978662

Change-Id: I680ded035b514a239c95eeeaab882b42509c82ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 07:38:47 +00:00
tom hsu
97821a7317 [Regional preference] Make prerference and fragment title are same. 
Bug: b/272440256
Test: Manual test passed
Change-Id: I0d5ce8f55977ce6fc300b28501f98f4860031380
 2023-03-15 15:35:34 +08:00
Jason Hsu
b6a359d888 Merge "Return getMetricsCategory() for each new page hearing aid and flash notifications in android U" into udc-dev am: 7ab852b48e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21978662

Change-Id: I4bf2d8d32cce70e63990e01a0c2ffb6a1e30ebd0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 07:05:15 +00:00
Jason Hsu
42fc665f48 Merge "Return getMetricsCategory() for each new page hearing aid and flash notifications in android U" into udc-dev am: 7ab852b48e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21978662

Change-Id: I73a880ba338b997595638fb615d37745c86c595e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 07:05:15 +00:00
SongFerngWang
7b80b4ecd9 Avoid ANR when UI query network selection state 
Moving the quert network selection state to back ground
and listening the service state to detect the betwork selection
changed.

Bug: 270652395
Test: atest AutoSelectPreferenceControllerTest
Change-Id: I81a597f28cf7ce25ff4eff5100bdb4d29c897a14
 2023-03-15 14:45:05 +08:00
Jason Hsu
7ab852b48e Merge "Return getMetricsCategory() for each new page hearing aid and flash notifications in android U" into udc-dev 2023-03-15 06:25:13 +00:00
Tom Hsu
6d462eaef0 Merge "Add Regional preference UI for Physical keyboard location." into udc-dev am: 29bcb4d553 am: 5fb635e82d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21913842

Change-Id: Ic28ed78b9c8a26a4f7a599baf19992c255f2547b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 05:38:58 +00:00
Tom Hsu
2f4e3b3041 Merge "Add Regional preference UI for Physical keyboard location." into udc-dev am: 29bcb4d553 am: 510b9b6b49 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21913842

Change-Id: Iac2042b8bfe511b51551394b7e7cd5b0cb16da17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 05:32:52 +00:00
Tom Hsu
510b9b6b49 Merge "Add Regional preference UI for Physical keyboard location." into udc-dev am: 29bcb4d553 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21913842

Change-Id: I066acb89131eab600688f44758288d75e68a0bd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 04:57:13 +00:00
Tom Hsu
5fb635e82d Merge "Add Regional preference UI for Physical keyboard location." into udc-dev am: 29bcb4d553 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21913842

Change-Id: I46c61d49106859d425f00531585e6ff61ed90545
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 04:56:16 +00:00
Tom Hsu
29bcb4d553 Merge "Add Regional preference UI for Physical keyboard location." into udc-dev 2023-03-15 04:21:02 +00:00
Diya Bera
4ffddaa19f Remove subtitle from biometric prompt in Settings (Passwords & Accounts) 
Bug: 250064171
Test: Manual - repro according to bug
Change-Id: I5896c3cec13d65093fa928db042952045269b93f
 2023-03-15 04:17:50 +00:00
tom hsu
397f06abff Add Regional preference UI for Physical keyboard location. 
Bug: b/271805730
Test: Maunal test.
Test: atest passed.
Change-Id: Iab4351c158d6cf24d1a5aa1307ef0182eec522ae
 2023-03-15 12:10:21 +08:00
Automerger Merge Worker
aaa3c072c4 Merge changes from topic "am-e11d37ae5f8f40d3a101634f86b7b204" 
* changes:
  [automerger skipped] Merge "Merge Android 13 QPR2" am: 19ca5d6a6e -s ours am: dc399ade52 -s ours am: 7e131d0b94 -s ours am: b17a40e1ae -s ours am: a0c2293966 -s ours
  [automerger skipped] Merge Android 13 QPR2 am: d15a2d7e0c -s ours am: d19379e607 -s ours am: 8d7a6eb577 -s ours am: 8ef1a9a1be -s ours am: 9a78f43bb0 -s ours
 2023-03-15 02:15:59 +00:00
Bill Yi
a73552148b Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Idd94e1c8ca5d1a8f1c46786e83d83a3d6b68493c
 2023-03-14 19:12:19 -07:00
Xin Li
a248a10223 [automerger skipped] Merge "Merge Android 13 QPR2" am: 19ca5d6a6e -s ours am: dc399ade52 -s ours am: 7e131d0b94 -s ours am: b17a40e1ae -s ours am: a0c2293966 -s ours 
am skip reason: Merged-In I44c7e97932456ec5b5bb0339ee2ee060cb6e42e0 with SHA-1 77a23c9ce2 is already in history

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

Change-Id: I7d3a5bf116166451ded6add8823b4909ded6e918
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 02:05:47 +00:00
Xin Li
f64b08cee4 [automerger skipped] Merge "Merge Android 13 QPR2" am: 19ca5d6a6e -s ours am: dc399ade52 -s ours am: 7e131d0b94 -s ours am: b17a40e1ae -s ours am: b893175b4b -s ours 
am skip reason: Merged-In I44c7e97932456ec5b5bb0339ee2ee060cb6e42e0 with SHA-1 77a23c9ce2 is already in history

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

Change-Id: Icdd71d3ab2efd14c30fa0dc7b781f177e1f381a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 02:05:25 +00:00
Xin Li
7c485bdf53 [automerger skipped] Merge Android 13 QPR2 am: d15a2d7e0c -s ours am: d19379e607 -s ours am: 8d7a6eb577 -s ours am: 8ef1a9a1be -s ours am: 9a78f43bb0 -s ours 
am skip reason: Merged-In I44c7e97932456ec5b5bb0339ee2ee060cb6e42e0 with SHA-1 77a23c9ce2 is already in history

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

Change-Id: Iafa821dd60c0a69841a853a1799e45210815cd78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 02:03:52 +00:00
Xin Li
3b742c4b3f [automerger skipped] Merge Android 13 QPR2 am: d15a2d7e0c -s ours am: d19379e607 -s ours am: 8d7a6eb577 -s ours am: 8ef1a9a1be -s ours am: fc853a6532 -s ours 
am skip reason: Merged-In I44c7e97932456ec5b5bb0339ee2ee060cb6e42e0 with SHA-1 77a23c9ce2 is already in history

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

Change-Id: I5811aced6c2611033116a77d3e68668496c4fbe7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 02:03:35 +00:00
Bill Yi
1de90287e1 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I7e52a4acd3f0f22fdc54abc909035f70d82173e9
 2023-03-14 19:03:27 -07:00
Bill Yi
787231f181 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ibd6b3121bd8feaaff3c9d4d83fd3a2cef5e42939
 2023-03-14 18:59:34 -07:00
Bill Yi
10f88f394b Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I5a2a759b2f6a8fe78071ead5fec83fb70359e639
 2023-03-14 18:57:46 -07:00
Xin Li
a0c2293966 [automerger skipped] Merge "Merge Android 13 QPR2" am: 19ca5d6a6e -s ours am: dc399ade52 -s ours am: 7e131d0b94 -s ours am: b17a40e1ae -s ours 
am skip reason: Merged-In I44c7e97932456ec5b5bb0339ee2ee060cb6e42e0 with SHA-1 77a23c9ce2 is already in history

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

Change-Id: Ib9e683f00be13412e96201e23ad2d731ea2fea73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 01:12:32 +00:00
Xin Li
9a78f43bb0 [automerger skipped] Merge Android 13 QPR2 am: d15a2d7e0c -s ours am: d19379e607 -s ours am: 8d7a6eb577 -s ours am: 8ef1a9a1be -s ours 
am skip reason: Merged-In I44c7e97932456ec5b5bb0339ee2ee060cb6e42e0 with SHA-1 77a23c9ce2 is already in history

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

Change-Id: I3fd9e49e82a926a72fb3aabf5f36ad68b36ef662
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 01:10:37 +00:00
Xin Li
b893175b4b [automerger skipped] Merge "Merge Android 13 QPR2" am: 19ca5d6a6e -s ours am: dc399ade52 -s ours am: 7e131d0b94 -s ours am: b17a40e1ae -s ours 
am skip reason: Merged-In I44c7e97932456ec5b5bb0339ee2ee060cb6e42e0 with SHA-1 77a23c9ce2 is already in history

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

Change-Id: I8974e6379744d31f0b43227d25021f773c6efc78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 01:09:56 +00:00
Grace Cheng
a796202f11 Update locked device icon in FingerprintEnrollIntroduction 
Changes locked device icon in FingerprintEnrollIntroduction to be form
factor agnostic

Test: (manual) navigate to FingerprintEnrollIntroduction and observe new
asset
Fixes: 268588691

Change-Id: I747a52319671c7b0f337f0a1c39a529da65b3f43
 2023-03-15 01:07:26 +00:00
Xin Li
fc853a6532 [automerger skipped] Merge Android 13 QPR2 am: d15a2d7e0c -s ours am: d19379e607 -s ours am: 8d7a6eb577 -s ours am: 8ef1a9a1be -s ours 
am skip reason: Merged-In I44c7e97932456ec5b5bb0339ee2ee060cb6e42e0 with SHA-1 77a23c9ce2 is already in history

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

Change-Id: I92e7b2bd2aee17dfc8742ab8e93b620ff403a0bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 01:07:09 +00:00
Xin Li
b17a40e1ae [automerger skipped] Merge "Merge Android 13 QPR2" am: 19ca5d6a6e -s ours am: dc399ade52 -s ours am: 7e131d0b94 -s ours 
am skip reason: Merged-In I44c7e97932456ec5b5bb0339ee2ee060cb6e42e0 with SHA-1 77a23c9ce2 is already in history

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

Change-Id: Ia2e022464f75ae3c2987737a53291c7d03091ece
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 00:08:04 +00:00
Xin Li
8ef1a9a1be [automerger skipped] Merge Android 13 QPR2 am: d15a2d7e0c -s ours am: d19379e607 -s ours am: 8d7a6eb577 -s ours 
am skip reason: Merged-In I44c7e97932456ec5b5bb0339ee2ee060cb6e42e0 with SHA-1 77a23c9ce2 is already in history

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

Change-Id: I211d2ed66eaef41adf6c905a2998c2405c4be05f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 00:06:07 +00:00
TreeHugger Robot
21cd138453 [automerger skipped] Merge "Merge credential manager providers by package name" into udc-dev am: e87159a591 am: ebf4e908c2 -s ours 
am skip reason: Merged-In Id48f27e96cabdd8ab0e8cbafc8eb760b7bbbf928 with SHA-1 043ba28892 is already in history

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

Change-Id: I9633854c84527a4ec67426d364feac749c4148ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-14 23:58:48 +00:00
TreeHugger Robot
f122de33ef [automerger skipped] Merge "Merge credential manager providers by package name" into udc-dev am: e87159a591 am: 712129d759 -s ours 
am skip reason: Merged-In Id48f27e96cabdd8ab0e8cbafc8eb760b7bbbf928 with SHA-1 043ba28892 is already in history

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

Change-Id: I935a6e7e51d3665a17da27b6a8ddd6a6e25dee37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-14 23:57:14 +00:00
Lucas Silva
15d65fcd1e Merge "Add home controls button to screensaver settings" into tm-qpr-dev am: 148f1592ef am: 5671ddb191 am: d17cb44367 am: 18b58726dc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21936019

Change-Id: Idddab6d7d713cce0e1d0935b29f105bc2ade64f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-14 23:45:23 +00:00
Lucas Silva
95d06ff9de Merge "Add home controls button to screensaver settings" into tm-qpr-dev am: 148f1592ef am: 5671ddb191 am: d17cb44367 am: c1e0f6f3ea 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21936019

Change-Id: Ia6d2268fb3ede33f805447fbdf8ed9c7fbd73145
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-14 23:43:16 +00:00
TreeHugger Robot
712129d759 Merge "Merge credential manager providers by package name" into udc-dev am: e87159a591 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21964743

Change-Id: I601a03aa2ad1b8a0776a9b1623c96ebf374856df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-14 23:23:41 +00:00
TreeHugger Robot
ebf4e908c2 Merge "Merge credential manager providers by package name" into udc-dev am: e87159a591 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21964743

Change-Id: I309fb2ec5a9c26b682cf1086d753ee2d60bc79b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-14 23:23:32 +00:00
Lucas Silva
c1e0f6f3ea Merge "Add home controls button to screensaver settings" into tm-qpr-dev am: 148f1592ef am: 5671ddb191 am: d17cb44367 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21936019

Change-Id: I62ef3a16f55bad8da006e719c0faf1d63b869535
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-14 23:21:50 +00:00
Lucas Silva
18b58726dc Merge "Add home controls button to screensaver settings" into tm-qpr-dev am: 148f1592ef am: 5671ddb191 am: d17cb44367 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21936019

Change-Id: I3c5bbcbeedf8150559666a5360671f38e87d9179
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-14 23:20:40 +00:00
Xin Li
7e131d0b94 [automerger skipped] Merge "Merge Android 13 QPR2" am: 19ca5d6a6e -s ours am: dc399ade52 -s ours 
am skip reason: Merged-In I44c7e97932456ec5b5bb0339ee2ee060cb6e42e0 with SHA-1 77a23c9ce2 is already in history

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

Change-Id: Idf60779f799c604ace73767b0483a609e861b9e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-14 23:08:02 +00:00
Xin Li
8d7a6eb577 [automerger skipped] Merge Android 13 QPR2 am: d15a2d7e0c -s ours am: d19379e607 -s ours 
am skip reason: Merged-In I44c7e97932456ec5b5bb0339ee2ee060cb6e42e0 with SHA-1 77a23c9ce2 is already in history

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

Change-Id: I4932292d3c8047b7eddac3c878e5f237ba510a80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-14 23:06:01 +00:00
TreeHugger Robot
e87159a591 Merge "Merge credential manager providers by package name" into udc-dev 2023-03-14 22:55:34 +00:00
Lucas Silva
d17cb44367 Merge "Add home controls button to screensaver settings" into tm-qpr-dev am: 148f1592ef am: 5671ddb191 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21936019

Change-Id: Ib9e3e0effc2f486a15c4caec31bdecde0f358029
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-14 22:39:31 +00:00
Xin Li
dc399ade52 [automerger skipped] Merge "Merge Android 13 QPR2" am: 19ca5d6a6e -s ours 
am skip reason: Merged-In I44c7e97932456ec5b5bb0339ee2ee060cb6e42e0 with SHA-1 77a23c9ce2 is already in history

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

Change-Id: I35578d54aa72f7abf031eba8873a14e4ccf9a54d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-14 22:35:18 +00:00
Xin Li
d19379e607 [automerger skipped] Merge Android 13 QPR2 am: d15a2d7e0c -s ours 
am skip reason: Merged-In I44c7e97932456ec5b5bb0339ee2ee060cb6e42e0 with SHA-1 77a23c9ce2 is already in history

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

Change-Id: Ideb892316ec21740723c3d5f06a1b3904f34c3ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-14 22:32:04 +00:00
Behnam Heydarshahi
04710fc421 Merge "Extend settings panel under navigation bar" into tm-qpr-dev am: 17701cd976 am: afb4dd1ece am: a1daad718e am: 3135bc59e0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20929206

Change-Id: Ic810d3df6fbda045d0210a72b6f027af6dfbdb3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-14 22:03:30 +00:00