Hao Dong
04b1932b25
Merge "Fix pattern rotation header text." into udc-d1-dev
2023-06-29 23:52:00 +00:00
Hao Dong
72f2058d3e
Merge "Fix Fingerprint enrollment UI when display size is largest." into udc-d1-dev
2023-06-29 23:51:50 +00:00
Matías Hernández
62bd80ee29
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292
am: 42bd4d88c2
-s ours am: 9eb2824be8
-s ours am: 97ecfd35d6
-s ours am: c4aa31013d
-s ours am: d828f6a917
-s ours am: 0d3e0dc397
-s ours am: 7088dd37ec
-s ours am: e0b9249359
-s ours
...
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 f0367c98d0
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726246
Change-Id: Icf19a7292abc519f50a74bbfeae77467106c486d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 23:22:41 +00:00
Matías Hernández
e0b9249359
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292
am: 42bd4d88c2
-s ours am: 9eb2824be8
-s ours am: 97ecfd35d6
-s ours am: c4aa31013d
-s ours am: d828f6a917
-s ours am: 0d3e0dc397
-s ours am: 7088dd37ec
-s ours
...
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 f0367c98d0
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726246
Change-Id: I563b580a28e6e46cdb31ee815a7b9552e82bd2c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 22:35:02 +00:00
Matías Hernández
7088dd37ec
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292
am: 42bd4d88c2
-s ours am: 9eb2824be8
-s ours am: 97ecfd35d6
-s ours am: c4aa31013d
-s ours am: d828f6a917
-s ours am: 0d3e0dc397
-s ours
...
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 f0367c98d0
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726246
Change-Id: I3aaeacc0f707d6a3c72fedf74aba8cb76a1ad6df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 21:55:19 +00:00
Matías Hernández
f64fefb48d
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292
am: 42bd4d88c2
-s ours am: 9eb2824be8
-s ours am: 97ecfd35d6
-s ours am: c4aa31013d
-s ours am: d828f6a917
-s ours am: b280f8792e
-s ours am: ae1f3e9159
-s ours
...
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 f0367c98d0
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726246
Change-Id: I261e8b4b37c787b890a7fa69fe2ffcd6718225c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 21:31:04 +00:00
Matías Hernández
ae1f3e9159
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292
am: 42bd4d88c2
-s ours am: 9eb2824be8
-s ours am: 97ecfd35d6
-s ours am: c4aa31013d
-s ours am: d828f6a917
-s ours am: b280f8792e
-s ours
...
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 f0367c98d0
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726246
Change-Id: Ie7d37b0a284c1c09b4760ba7c01bedf2327ee3c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 21:03:28 +00:00
Matías Hernández
0d3e0dc397
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292
am: 42bd4d88c2
-s ours am: 9eb2824be8
-s ours am: 97ecfd35d6
-s ours am: c4aa31013d
-s ours am: d828f6a917
-s ours
...
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 f0367c98d0
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726246
Change-Id: I240139ad6fd2072b7c2990a20423dfeed10b9763
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 20:22:12 +00:00
Matías Hernández
b280f8792e
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292
am: 42bd4d88c2
-s ours am: 9eb2824be8
-s ours am: 97ecfd35d6
-s ours am: c4aa31013d
-s ours am: d828f6a917
-s ours
...
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 f0367c98d0
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726246
Change-Id: I8bb98fc243ae74641ac4a7f44af0ece284dc9ab3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 20:21:10 +00:00
Matías Hernández
d828f6a917
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292
am: 42bd4d88c2
-s ours am: 9eb2824be8
-s ours am: 97ecfd35d6
-s ours am: c4aa31013d
-s ours
...
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 f0367c98d0
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726246
Change-Id: I8351da597688d18c52b97ed1f22e909cfc168a7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 19:49:05 +00:00
Matías Hernández
c4aa31013d
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292
am: 42bd4d88c2
-s ours am: 9eb2824be8
-s ours am: 97ecfd35d6
-s ours
...
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 f0367c98d0
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726246
Change-Id: I62449382a3b6365bfe7fba8b1f148be486f9235f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 18:45:31 +00:00
Matías Hernández
97ecfd35d6
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292
am: 42bd4d88c2
-s ours am: 9eb2824be8
-s ours
...
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 f0367c98d0
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726246
Change-Id: Ib2b171219769531b706b62ccb6759adeacc1129d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 17:57:31 +00:00
Matías Hernández
9eb2824be8
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292
am: 42bd4d88c2
-s ours
...
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 f0367c98d0
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726246
Change-Id: Ib404f16baae58c5244ba61fe82974a1d93fa681a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 17:11:24 +00:00
Matías Hernández
42bd4d88c2
Settings: don't try to allow NLSes with too-long component names am: f1af8c5292
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726246
Change-Id: Iaf37229e9570c29792e801446e8db162ebb3dbda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 16:25:28 +00:00
Matías Hernández
99f3eb361b
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f0367c98d0
am: 5985612633
am: 95fbc856ad
-s ours am: 8c1394e58e
-s ours am: 476dd8fba2
-s ours am: c1d4561832
-s ours am: e1745a9d28
-s ours
...
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 b88fbf932a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23712724
Change-Id: Ia6e69f88a1b2da9669ca46eacf1e9ec6083ef70d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 13:28:07 +00:00
Matías Hernández
b0bf5532ff
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f0367c98d0
am: 5985612633
am: 95fbc856ad
-s ours am: 8c1394e58e
-s ours am: df3f3ff5c2
-s ours am: a590ecb718
-s ours
...
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 b88fbf932a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23712724
Change-Id: Iecd927edd6e7728b40e80e75b82240cc4634a4dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 13:03:54 +00:00
Matías Hernández
e1745a9d28
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f0367c98d0
am: 5985612633
am: 95fbc856ad
-s ours am: 8c1394e58e
-s ours am: 476dd8fba2
-s ours am: c1d4561832
-s ours
...
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 b88fbf932a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23712724
Change-Id: Id55e3ebb96a70e610c47a6df16c537a0691416fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 13:03:48 +00:00
Matías Hernández
c1d4561832
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f0367c98d0
am: 5985612633
am: 95fbc856ad
-s ours am: 8c1394e58e
-s ours am: 476dd8fba2
-s ours
...
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 b88fbf932a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23712724
Change-Id: I89b51fbd2791e323be34fc92d128095a093c9e3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 12:24:58 +00:00
Matías Hernández
a590ecb718
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f0367c98d0
am: 5985612633
am: 95fbc856ad
-s ours am: 8c1394e58e
-s ours am: df3f3ff5c2
-s ours
...
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 b88fbf932a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23712724
Change-Id: Iab97bd80d0e4ed0fa4391efc43a05f23f8095f91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 12:22:27 +00:00
Matías Hernández
476dd8fba2
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f0367c98d0
am: 5985612633
am: 95fbc856ad
-s ours am: 8c1394e58e
-s ours
...
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 b88fbf932a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23712724
Change-Id: Id6a9b6a60b2455596795c11b3d286cc84a71d42b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 11:41:09 +00:00
Matías Hernández
df3f3ff5c2
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f0367c98d0
am: 5985612633
am: 95fbc856ad
-s ours am: 8c1394e58e
-s ours
...
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 b88fbf932a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23712724
Change-Id: I635acdf5b2b37d084c6e43a33fa3406402b49177
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 11:40:04 +00:00
Matías Hernández
8c1394e58e
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f0367c98d0
am: 5985612633
am: 95fbc856ad
-s ours
...
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 b88fbf932a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23712724
Change-Id: I729b32b7ace1c1679c14ed555fd7d87e8d86f72d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 10:52:31 +00:00
Matías Hernández
95fbc856ad
Settings: don't try to allow NLSes with too-long component names am: f0367c98d0
am: 5985612633
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23712724
Change-Id: Ic711190cfc7ce3437e324a96d97c628b52d48480
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 10:13:23 +00:00
Matías Hernández
5985612633
Settings: don't try to allow NLSes with too-long component names am: f0367c98d0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23712724
Change-Id: I51744909a3ef6fcb1406dcc24d857d9b9eb88057
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 09:29:06 +00:00
Matías Hernández
7e8f8e9306
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: b88fbf932a
am: 7847d336d9
am: 253f948aad
-s ours am: e385aee1cd
-s ours
...
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 b88fbf932a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23728493
Change-Id: I0aa292fc9a772c1e6e46a46e02b65f666e643136
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 01:42:27 +00:00
Matías Hernández
29aa0ee34a
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: b88fbf932a
am: 42afd3c182
-s ours am: 9dbcbfaa12
-s ours
...
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 027f0a46ae
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23728493
Change-Id: Iafe3f0f2f3f0cfa1b8a553953565032dec0c2e04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 01:42:12 +00:00
Matías Hernández
e385aee1cd
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: b88fbf932a
am: 7847d336d9
am: 253f948aad
-s ours
...
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 b88fbf932a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23728493
Change-Id: Iddc7166a9254597a82d5a19f144429e712faec14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 01:41:21 +00:00
Matías Hernández
253f948aad
Settings: don't try to allow NLSes with too-long component names am: b88fbf932a
am: 7847d336d9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23728493
Change-Id: I84d8aa08502725d1e24d80946884eb8cab9287ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 00:59:57 +00:00
Matías Hernández
9dbcbfaa12
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: b88fbf932a
am: 42afd3c182
-s ours
...
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 027f0a46ae
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23728493
Change-Id: Idd23bcdf229afda6451ad92e7c13cb7410d5a869
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 00:57:12 +00:00
Matías Hernández
7847d336d9
Settings: don't try to allow NLSes with too-long component names am: b88fbf932a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23728493
Change-Id: Ib235490bd7dc40a1d5146cdb8ea20abed4406996
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 00:16:39 +00:00
Matías Hernández
42afd3c182
Settings: don't try to allow NLSes with too-long component names am: b88fbf932a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23728493
Change-Id: I3228d4d29e905c0481fe1637580aaf2caaab9cc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 00:15:34 +00:00
Grace Cheng
d7e397e97c
[automerger skipped] Merge "Fix NPE in updateAddPreference" into udc-dev am: 25b489e212
-s ours
...
am skip reason: Merged-In Id7edde492168b467360c6c99b326721cd883bba8 with SHA-1 2365ad895a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23667755
Change-Id: I76d59e589e5f8882f2872da723dc20975ea60a1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-28 18:40:15 +00:00
Grace Cheng
0dcfdacc25
[automerger skipped] Fix NPE in updateAddPreference am: f58714496a
-s ours
...
am skip reason: Merged-In Id7edde492168b467360c6c99b326721cd883bba8 with SHA-1 2365ad895a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23667755
Change-Id: Ie5120e61d7df71adf77970088a3be7334ed6a4f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-28 18:40:12 +00:00
Grace Cheng
25b489e212
Merge "Fix NPE in updateAddPreference" into udc-dev
2023-06-28 17:41:13 +00:00
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
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
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
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
85a90ef00b
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-06-24 02:45:00 +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