Matías Hernández
aaddfd88e9
Merge "Settings: don't try to allow NLSes with too-long component names" into udc-dev am: 4d34eb2c7a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726247
Change-Id: If35fbb5c16a642b56de29012ce43ecd7f068d5b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-28 17:14:55 +00:00
Matías Hernández
0d21526217
Merge "Settings: don't try to allow NLSes with too-long component names" into udc-dev am: 4d34eb2c7a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726247
Change-Id: I1e1dbbdf2b1834da763835c1bbcd263cdb27eb09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-28 17:10:34 +00:00
Matías Hernández
4d34eb2c7a
Merge "Settings: don't try to allow NLSes with too-long component names" into udc-dev
2023-06-28 16:42:13 +00:00
Hao Dong
7b99d92464
Fix pattern rotation header text.
...
Bug: 278055194
Test: atest ChooseLockPatternTest
Change-Id: I36ec325b46d7a7f583d94dc26f9962cadc3874cd
Merged-In: I36ec325b46d7a7f583d94dc26f9962cadc3874cd
2023-06-27 17:50:15 +00:00
Hao Dong
2ca3f3232c
Fix Fingerprint enrollment UI when display size is largest.
...
1. Remove land/udfps_enroll_enrolling and use the default land layout
instead. Swap header and content when necessary to avoid overlap.
2. Add UdfpsEnrollEnrollingView.java
Test: manual test - 1. Set system display and font size largest
2. Launch fingerprint enrollment and check UI.
Test: atest FingerprintEnrollEnrollingTest
Bug: 269060514
Bug: 283169056
Change-Id: Ifbe6c92c4213979952f2f89a1cd595c9c4bff6ec
Merged-In: Ifbe6c92c4213979952f2f89a1cd595c9c4bff6ec
2023-06-27 17:48:16 +00:00
Michael Mikhail
6308e3fb2a
Trigger talkback for notification volume change
...
Triggers talkback to say the content description of the title of
notification volume when notification volume is set to vibrate or silent
mode.
Fixes: 285453719
Fixes: 285455826
Test: manually checked when the ring volume is set to 0% and when the
notification volume is set to 0%. Check the video in the bug link.
Change-Id: I4bd65bdbfa41793fc8e32c295185363ca36cc0d7
2023-06-27 17:01:18 +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
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
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
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
Bill Yi
587cddef51
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e2abc0ab7a
-s ours am: a35176545a
-s ours am: e1dc1a0748
-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: I5a7199c80bde4ac8e7710606bfd4fb84be0d6eaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-26 23:02:07 +00:00
Xin Li
c61819e807
[automerger skipped] Merge "Merge Android 13 QPR3" am: 65c31baf7f
-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: I2d14107a37340b8b34ae71c67f7f705a272324b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-26 22:59:27 +00:00
Xin Li
ba9cb49565
[automerger skipped] Merge Android 13 QPR3 am: 3e6b213e75
-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: I86a2ecc0803fdf920a6a10367d7eb0f9d06b6807
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-26 22:57:43 +00:00
Xin Li
65c31baf7f
Merge "Merge Android 13 QPR3"
2023-06-26 22:29:52 +00:00
Hao Dong
be823bc598
Wait for systemui udfps overlay ready to show settings udfps enroll view.
...
Previously, we show settings's udfps enroll animation view (the fingerprint icon and progress view) once the FingerprintEnrollEnrolling is shown.
However, touch events have to wait for systemui's udfps overlay to be valid. This CL lets settings's udfps enroll view wait for systemui's overlay.
1. Sets udfps enroll animation view's default visibility Gone.
2. Propagates FingerprintManager#onUdfpsOverlayShown to
FingerprintEnrollEnrolling and when it's called, set the enroll view
visible.
Besides, this CL renames onPointerDown() and onPointerUp() with Udfps.
Bug: 280718879
Test: atest FingerprintEnrollEnrollingTest
Change-Id: Ieed3e74c182828918785edcacb021f19a3665f2a
2023-06-26 20:21:05 +00:00
TreeHugger Robot
a384319039
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 85a90ef00b
-s ours am: 3c67940884
-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: I8e28b8b1240a5cbd61b5d04a9940e8209ae79ee0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-24 04:26:45 +00:00
Bill Yi
edf68d6fde
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 374a3112e3
-s ours am: e58596dd7a
-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: I0c2cd5123f0b246f34216ad4f9b774a4f06f02cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-24 04:26:31 +00:00
TreeHugger Robot
3c67940884
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 85a90ef00b
-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: Ib42a8d1aeb507f6893bea30502698b9a1a1de0fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-24 03:19:49 +00:00
Bill Yi
e58596dd7a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 374a3112e3
-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: Id8efcca9c0ca97ba62484aaeb557b9fd6bd00714
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-24 03:19:37 +00:00
TreeHugger Robot
60f8d67f1d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 85a90ef00b
-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: Ib0d7180f1f7dc67744917dcbeb953b11d7f8b060
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-24 03:15:06 +00:00
Bill Yi
6cb8b3b00c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 374a3112e3
-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: I66740e6fc05874d959352ffbedafe8e277ef5eb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-24 03:14:51 +00:00
TreeHugger Robot
85a90ef00b
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-06-24 02:45:00 +00:00
Bill Yi
e4a787f1f0
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e2abc0ab7a
-s ours am: 392e63d166
-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: I2fff5fc42e5787b7774bb6d8f52655c5da4c6d6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-24 01:21:06 +00:00
Bill Yi
6776568ed6
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 364eb998be
-s ours am: aa006392a2
-s ours am: 3040828b99
-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: I93c487c7e247f44773722b5a5d3d84feeeb2e80d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-24 00:34:21 +00:00
Bill Yi
a326705d46
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e2abc0ab7a
-s ours am: a35176545a
-s ours am: 359a96eb80
-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: I18068ff55838aaae4ba15db6024ae0b321dfab90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-24 00:31:16 +00:00
Treehugger Robot
2c2e85e8ae
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 3c796f10fe
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23789284
Change-Id: I55d59108d63280bb160946c88d46ae42e6bb2561
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-24 00:25:41 +00:00
Bill Yi
9a9e3f3ac9
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 28cf36e37d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23789284
Change-Id: Ic7df2257e0f746d6204356a8d7e73486b24be3e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-24 00:25:36 +00:00
Bill Yi
17da3f14c5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d772bd36b1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23788722
Change-Id: I769bb68dcaf96f0cc0ae450c930013184f4cb496
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-24 00:25:15 +00:00
Bill Yi
5f53b4c10e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 364eb998be
-s ours am: aa006392a2
-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: I0c3014ba4a7077e4873486aa345607ff9c2a04cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-24 00:16:48 +00:00
Bill Yi
e1dc1a0748
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e2abc0ab7a
-s ours am: a35176545a
-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: Ib8e27273935ec71cdba18eca0bffe96f26397ce4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-24 00:13:26 +00:00
Bill Yi
392e63d166
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e2abc0ab7a
-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: I853a031bccb32b7086892e93b062fc1a8624c894
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-24 00:12:13 +00:00
Bill Yi
3040828b99
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 364eb998be
-s ours am: aa006392a2
-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: I91dddea57e63705557615fee3655a7608f9b577b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-24 00:11:16 +00:00
Bill Yi
359a96eb80
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e2abc0ab7a
-s ours am: a35176545a
-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: Ic785c6441f42fadf6967c51b5da25b1957b5a33d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-24 00:06:42 +00:00
Bill Yi
aa006392a2
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 364eb998be
-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: If37e1601cb241afb5cdcba0673da2576acdeb7f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-23 23:23:16 +00:00
Bill Yi
a35176545a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e2abc0ab7a
-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: I4dacd8d123551565d05bcdb7444b33051e1a74ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-23 23:19:35 +00:00
Treehugger Robot
3c796f10fe
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-06-23 22:24:59 +00:00
Bill Yi
28cf36e37d
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I0fe5b71d7ef1901d3b7238e0cd8db2fcafaffda7
2023-06-22 22:09:39 -07:00
Bill Yi
e2abc0ab7a
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ia036b42598639dac49342562f238cb378b3f6091
2023-06-22 22:06:04 -07:00
Bill Yi
d772bd36b1
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I22bbb5c016e705cbc07f4824acd0d33f9e094e98
2023-06-22 22:04:11 -07:00
Bill Yi
374a3112e3
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I4477e0289b2b1cc331320e550cef7f74ec2af74e
2023-06-22 22:02:27 -07:00
Bill Yi
364eb998be
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9aa9cc04f3cff9f455ced6d6fe8b384c4954b21f
2023-06-22 21:57:59 -07:00
Bill Yi
7f8405f202
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24a7a54341
-s ours am: ced4e8df8b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23781176
Change-Id: I586cf6243fbdba7f4328b2e1da4bcd1bee4394e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-23 00:52:45 +00:00