PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
131,645 Commits 1 Branch 0 Tags
68b4e047b64e63de69f3bc9ff332a37673b15d94
Commit Graph

131645 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
ac00ec0b8a Merge "Correct Factory Reset activity protect permission" into udc-qpr-dev am: dd3e338823 am: 650a7e9298 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467970

Change-Id: Ib3f2cc4ec57b7d5e613fdf42bb05bb9a4db63fad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-27 09:21:19 +00:00
Edgar Wang
abe00cabad Correct used size of Storage Settings. am: e52320e755 am: 88659e80d9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23483884

Change-Id: I34a0e0084c28c0c575ab0081e53e81e8a18f9b8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-27 09:20:29 +00:00
Treehugger Robot
0c021e70b2 Merge "Remove setAssistOnly() from GestureSettings" 2023-06-27 09:09:23 +00:00
Treehugger Robot
4600c0009f Merge "[BiometricsV2] Refactor EnrollingUdfpsFragment" 2023-06-27 09:03:29 +00: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
Chaohui Wang
16cb921c47 Remove setAssistOnly() from GestureSettings 
Fix issue that use(AssistGestureSettingsPreferenceController.class)
could be null.

Bug: 287566056
Test: manually - on System > Gestures page
Change-Id: Ifb78a787c34e2fd0e255a6473b8c514f2788f52e
 2023-06-27 16:08:25 +08:00
Xin Li
84351db496 [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: 7a4625239f -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: Ic7eec29790f3bf176e23b59e55d261e0a0755f18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-27 08:07:44 +00:00
Xin Li
bea3b18c7c [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: 96633fda9a -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: I9e4fcaebf613902e54229e5c8523b40703731f00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-27 08:05:59 +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
Milton Wu
5f8620d571 [BiometricsV2] Refactor EnrollingUdfpsFragment 
Refactor FingerprintEnrollEnrollingUdfpsFragment to kotlin and add
bindView() method for it

Bug: 286198032
Test: atest FingerprintEnrollmentActivityTest
Test: atest BiometricsMicrobenchmark:biometrics-enrollment-test
Test: Manually test enrollment as Udfps device
Change-Id: Ife1e14ffabc4716acc53b67f641ba9cf159319f2
 2023-06-27 07:12:50 +00:00
Chaohui Wang
457993bc91 Merge "Clean up AwareFeatureProvider from Settings" 2023-06-27 06:52:13 +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
9c8456b242 [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: f703764efd -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: I29fd14a7769cb1b3524f2a34d2ad30effbc255d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-27 06:20:10 +00:00
Bill Yi
9de9c82974 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 374a3112e3 -s ours am: 6cb8b3b00c -s ours am: f44874ca83 -s ours am: d6d923c325 -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: I9f0d7832c7bf8da5c66976153b77c8786fb4612d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-27 06:20:08 +00:00
Bill Yi
363b52e9ad [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: e8993b5116 -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: I92f7ab877071cd4cdfb2621fac4dc502a804da74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-27 06:18:58 +00:00
Hao Dong
1622d64cc1 Merge "Wait for systemui udfps overlay ready to show settings udfps enroll view. am: be823bc598" into udc-qpr-dev am: 0df79b1ccc am: ae04426d02 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23814463

Change-Id: If6f3e7ce9345128c61926e080fddc97af5cafc73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-27 06:17:10 +00:00
Zoey Chen
d6d2a1d06b [Regional Preference] Add metric in Regional Preferences am: ca617d8612 am: c3bd5c2059 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23817103

Change-Id: Ic5bca6d4b2cc1507ca7e3d27d4b4797196dc7be5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-27 06:16:22 +00:00
Hao Dong
a7c94bfbcb Wait for systemui udfps overlay ready to show settings udfps enroll view. am: be823bc598 am: 93bcf8122c am: ed83c055df 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23814463

Change-Id: I93fe1f323682b2239bcf304a98a4018b16f53b3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-27 06:15:45 +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
Zoey Chen
c3bd5c2059 [Regional Preference] Add metric in Regional Preferences am: ca617d8612 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23817103

Change-Id: I8aa917c29aab30def405455d1465be64032335b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-27 05:52:46 +00:00
Hao Dong
0df79b1ccc Merge "Wait for systemui udfps overlay ready to show settings udfps enroll view. am: be823bc598" into udc-qpr-dev 2023-06-27 05:37:33 +00:00
Zoey Chen
ca617d8612 [Regional Preference] Add metric in Regional Preferences 
Bug: 279918056
Test: manual
Change-Id: I71a16a96f2e647945b20cbfeee63d96b0f3a188f
 2023-06-27 05:16:28 +00:00
Xin Li
e849e3a643 [automerger skipped] Merge "Merge Android 13 QPR3" am: 65c31baf7f -s ours am: c61819e807 -s ours am: 164acf327a -s ours am: bcc898dbed -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: I2d0bd47af32ef241bc25755f8deedc5950716c3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-27 01:15:56 +00:00
Xin Li
c9bfd995a9 [automerger skipped] Merge Android 13 QPR3 am: 3e6b213e75 -s ours am: ba9cb49565 -s ours am: e7ba843385 -s ours am: 8244a2aeb4 -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: I823fb94c9e393c6f3de5538dd1330906d11f801b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-27 01:14:07 +00:00
Bill Yi
bebf9bd4c7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 364eb998be -s ours am: aa006392a2 -s ours am: 5f53b4c10e -s ours am: 5f846bb466 -s ours am: 07c5c9d710 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9b1f5e375aae11ae9dc73f1fa81ac635085d519b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-27 00:40:57 +00:00
Bill Yi
cbc2ef6052 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e2abc0ab7a -s ours am: a35176545a -s ours am: e1dc1a0748 -s ours am: 587cddef51 -s ours am: f795b00b5c -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: I0409c77091047cf5406695dd6f17e83a8ea70e33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-27 00:36:17 +00:00
Xin Li
bcc898dbed [automerger skipped] Merge "Merge Android 13 QPR3" am: 65c31baf7f -s ours am: c61819e807 -s ours am: 164acf327a -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: Idb89b852b5efc879a47552fdab0ca72a8169a756
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-27 00:34:24 +00:00
Xin Li
8244a2aeb4 [automerger skipped] Merge Android 13 QPR3 am: 3e6b213e75 -s ours am: ba9cb49565 -s ours am: e7ba843385 -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: I10491b313218cc917510d28164cf1758adbab070
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-27 00:32:37 +00:00
Hao Dong
ed83c055df Wait for systemui udfps overlay ready to show settings udfps enroll view. am: be823bc598 am: 93bcf8122c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23814463

Change-Id: I9fc884ce09f3858c53e7fe9fea2a664ac32f3e5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-26 23:49:52 +00:00
Bill Yi
07c5c9d710 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 364eb998be -s ours am: aa006392a2 -s ours am: 5f53b4c10e -s ours am: 5f846bb466 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4a34153ae7b2389c7e84652ea6eb01a97680a604
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-26 23:46:38 +00:00
Bill Yi
f795b00b5c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e2abc0ab7a -s ours am: a35176545a -s ours am: e1dc1a0748 -s ours am: 587cddef51 -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: I0b62529b7e69220452eacc2014b9bf604d697afe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-26 23:43:47 +00:00
Michael Mikhail
499f965c1c 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-26 23:35:39 +00:00
TreeHugger Robot
48fa611907 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 85a90ef00b -s ours am: 60f8d67f1d -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: Ia5603c0cf61378817b36a2d933667220f536ac32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-26 23:34:14 +00:00
Bill Yi
f44874ca83 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 374a3112e3 -s ours am: 6cb8b3b00c -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: I30bda311566714246e07507b8c664dfba85c6066
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-26 23:34:10 +00:00
Bill Yi
dac919f41a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e2abc0ab7a -s ours am: 392e63d166 -s ours am: e4a787f1f0 -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: I8e49ca184085c44061792d9fd8247b4193938b3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-26 23:33:14 +00:00
Hao Dong
ae87a68cda Wait for systemui udfps overlay ready to show settings udfps enroll view. am: be823bc598 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23814463

Change-Id: I405d8bbbde142073214adbf663813f25667835fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-26 23:31:41 +00:00
Hao Dong
93bcf8122c Wait for systemui udfps overlay ready to show settings udfps enroll view. am: be823bc598 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23814463

Change-Id: I0b509bd402107442b93f6855f34389dfa61c59e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-26 23:26:53 +00:00
Xin Li
164acf327a [automerger skipped] Merge "Merge Android 13 QPR3" am: 65c31baf7f -s ours am: c61819e807 -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: Id8b3ff644094f429231676ca4b4aa34a23ac4062
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-26 23:12:11 +00:00
Xin Li
e7ba843385 [automerger skipped] Merge Android 13 QPR3 am: 3e6b213e75 -s ours am: ba9cb49565 -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: I539ae150f02bd6b5d03249c043cefc8323a31dec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-26 23:10:28 +00:00
Bill Yi
5f846bb466 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 364eb998be -s ours am: aa006392a2 -s ours am: 5f53b4c10e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic4f33decef8093aed197c68e69afbb34d0fe0976
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-26 23:09:32 +00:00