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

131179 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
Eric Biggers
d419163ecd Merge "ChooseLockPassword: convert to use PasswordMetrics#validateCredential()" 2023-06-26 15:34:20 +00:00
Shawn Lin
5f17b1c9da Merge "Set the light status bar flag if not in dark mode" into udc-qpr-dev am: bf7b928f0c am: c7e8393778 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726369

Change-Id: I2a7dbaa9f9078e47683a0ecfbba7a99892f9c8e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-26 07:46:51 +00:00
Chaohui Wang
f769955aba Merge "Fix ANR in TelephonyStatusControlSession" into udc-qpr-dev am: 99b29e068e am: b3a06d46fa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23761226

Change-Id: I5fe997d593c89ac5122e51eaeff958ae59ea63c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-26 07:46:17 +00:00
Shawn Lin
c7e8393778 Merge "Set the light status bar flag if not in dark mode" into udc-qpr-dev am: bf7b928f0c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726369

Change-Id: I37bd5e0669292a784478ddd748b8c51c5947cd06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-26 07:01:52 +00:00
Chaohui Wang
b3a06d46fa Merge "Fix ANR in TelephonyStatusControlSession" into udc-qpr-dev am: 99b29e068e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23761226

Change-Id: Ibeca1686a558a5f9fd9f55bec93169d34f3549fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-26 07:01:33 +00:00
Shawn Lin
bf7b928f0c Merge "Set the light status bar flag if not in dark mode" into udc-qpr-dev 2023-06-26 06:43:36 +00:00
Chaohui Wang
99b29e068e Merge "Fix ANR in TelephonyStatusControlSession" into udc-qpr-dev 2023-06-26 06:21:38 +00:00
Treehugger Robot
96e8030453 Merge "Fix back key display issue in the split-screen" 2023-06-26 06:01:24 +00:00
Sunny Shao
4b1e982898 Fix back key display issue in the split-screen 
- Move the back key display module into the onResume.

Fixes: 280005953
Test: manual test
Change-Id: I289c5fab678fde8345a35d7909307f153a0d812f
 2023-06-26 11:23:28 +08:00
Treehugger Robot
4ce984873e Merge "[BiometricsV2] Refactor FindUdfpsFragment" 2023-06-26 03:22:23 +00:00
Treehugger Robot
f644912212 Merge "Stop the searching of broadcast" into udc-qpr-dev am: c97fe1a27f am: f75356ca21 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23744199

Change-Id: If6e8441947bd9bd7dffcda74be514ab98a1df3ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-25 19:39:56 +00:00
Treehugger Robot
f75356ca21 Merge "Stop the searching of broadcast" into udc-qpr-dev am: c97fe1a27f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23744199

Change-Id: I74132b143b5312886d27ddf6f8e5eb3bb74ce9c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-25 18:52:19 +00:00
Treehugger Robot
c97fe1a27f Merge "Stop the searching of broadcast" into udc-qpr-dev 2023-06-25 18:11:03 +00:00
Bill Yi
5464140360 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod am: 616457304e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib859d17dfd456541ef8a06f24dce88c605226108
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-24 18:22:53 +00:00
Bill Yi
3b1954425a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 137f4ad8fb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If02df9eefb465e99c5101051eba228b7132bed95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-24 18:22:34 +00:00
Bill Yi
616457304e Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod 2023-06-24 17:35:14 +00:00
TreeHugger Robot
cb78cce78f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 85a90ef00b -s ours am: 3c67940884 -s ours am: 7239e2d59a -s ours am: 6c1f5635c9 -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: If7b7c0858e8832480f1d5ec06d7ecbca59ab01f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-24 06:06:37 +00:00
Bill Yi
cd149e0be7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 374a3112e3 -s ours am: e58596dd7a -s ours am: 4e18461b69 -s ours am: 5bdd121377 -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: I1da4cb65a14a01afdbdd2a5a1397e09b3e3fea85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-24 06:06:27 +00:00
TreeHugger Robot
59b6a550d8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 85a90ef00b -s ours am: 3c67940884 -s ours am: a384319039 -s ours am: 3a29b94dd3 -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: Iaf2da393121c1025bcfe9ae936c16c4a4de91917
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-24 06:04:32 +00:00
Bill Yi
23b2008e9c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 374a3112e3 -s ours am: e58596dd7a -s ours am: edf68d6fde -s ours am: 015c56c372 -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: Id88a9de924e205256d361d8133bf6ba0121f962b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-24 06:04:18 +00:00
TreeHugger Robot
6c1f5635c9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 85a90ef00b -s ours am: 3c67940884 -s ours am: 7239e2d59a -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: I541fe8003433a314765599b7107e6452350e16e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-24 05:18:44 +00:00
Bill Yi
5bdd121377 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 374a3112e3 -s ours am: e58596dd7a -s ours am: 4e18461b69 -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: I6e94ed89624bb0d50579a8991cac321bf090c56b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-24 05:18:34 +00:00
TreeHugger Robot
3a29b94dd3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 85a90ef00b -s ours am: 3c67940884 -s ours am: a384319039 -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: I0ca668d9d7a477b5b27ab59edefdba583262f08c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-24 05:12:39 +00:00
Bill Yi
015c56c372 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 374a3112e3 -s ours am: e58596dd7a -s ours am: edf68d6fde -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: I512de0e15f4e82f44f27c866753f2f031726f72a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-24 05:12:24 +00:00
TreeHugger Robot
7239e2d59a [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: I255f7cc58d393c76d2a77ca414ba0d45f5bc4efd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-24 04:31:12 +00:00
Bill Yi
4e18461b69 [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: I76a102b086f132dec6419781291db796d9c2203e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-24 04:30:57 +00:00
Automerger Merge Worker
bd3730a281 Merge changes from topic "am-1d0d7a7d70314ea2bea3244daa2f6aa6" 
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 85a90ef00b -s ours am: 949bb6d631 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 374a3112e3 -s ours am: 4438349c54 -s ours
 2023-06-24 04:27:23 +00:00
TreeHugger Robot
5f6dcbda92 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 85a90ef00b -s ours am: 949bb6d631 -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: Ie57a5de1e1dd164d7e92f92dce98a44cfd65636a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-24 04:26:46 +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
TreeHugger Robot
f1843ff8fb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 85a90ef00b -s ours am: 636d316e57 -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: I239cdb91af8b5e1b0587bed756f5adc3ba0bbd07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-24 04:26:44 +00:00
Bill Yi
b9715e0ab3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 374a3112e3 -s ours am: 4438349c54 -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: Ib4103517ed7891e603e129afeba738da1f48cd9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-24 04:26:32 +00:00
Bill Yi
740df4248a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 374a3112e3 -s ours am: f5b3ef4010 -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: Ie4f98eeb4bba1f2a577500f87d52daf671e47cd4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-24 04:26:32 +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
TreeHugger Robot
636d316e57 [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: I04eb5c9acd3f70f435e503f968d79548c93de350
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-24 03:19:37 +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
Bill Yi
f5b3ef4010 [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: I9c4945e08d5f23f2cca89bf427ed163eb87c8f31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-24 03:19:28 +00:00
TreeHugger Robot
949bb6d631 [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: I15565e6fd2315993e6fdd375e1069a2f60b12b00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-24 03:19:26 +00:00
Bill Yi
4438349c54 [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: I33cc8a0a77a663bac76fae5fa568ffc5a4956325
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-24 03:19:13 +00:00
Bill Yi
1f5aac124e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: d2f8ae2555 -s ours am: e14b9921de -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibde641d40934ad00c3af2c203842a45d17a10fe2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-24 03:00:18 +00:00