Commit Graph

126499 Commits

Author SHA1 Message Date
Bill Yi
d80924b335 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 364eb998be -s ours am: aa006392a2 -s ours am: 3040828b99 -s ours am: 6776568ed6 -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: Iff64ad0d4fad050c82a65eb5c1fda4cb1c693661
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-24 01:34:11 +00:00
Bill Yi
28d0e5da74 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e2abc0ab7a -s ours am: a35176545a -s ours am: 359a96eb80 -s ours am: a326705d46 -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: I75a6340ae7196c173c69ef15a7988e9e29d4e6d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-24 01:31:12 +00:00
Treehugger Robot
6b26eedb12 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 3c796f10fe -s ours am: 2c2e85e8ae -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: I566a48f2ccffe9744ddf0b998f5bff78f105cc8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-24 01:24:33 +00:00
Bill Yi
6e2237a971 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 28cf36e37d -s ours am: 9a9e3f3ac9 -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: If0e60f41a1d9f34f8e4466b4ebc0832d322ad336
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-24 01:24:30 +00:00
Bill Yi
504065164e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d772bd36b1 -s ours am: 17da3f14c5 -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: I8fc81c409b431f044d848eb73af0306fa2f9b363
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-24 01:24:10 +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
Treehugger Robot
6f5ab58710 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 3c796f10fe -s ours am: fff50202bb -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: Iec15b4bee495482e4446430413344ceb248a0454
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-24 00:19:32 +00:00
Bill Yi
ebe1a71e09 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 28cf36e37d -s ours am: 2736439ffe -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: Iceae13ca5c1b13a2aadb33bdf22fce599896e9a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-24 00:19:22 +00:00
Bill Yi
756972e97a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d772bd36b1 -s ours am: 80076b90b1 -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: Ibaf1fb2ed82786cade17afff0e985ef722b64008
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-24 00:19:09 +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
fff50202bb [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: Ic4881f194a8ebc127466defb6479d49458a964fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-23 22:56:20 +00:00
Bill Yi
2736439ffe [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: I88f14792e729f8f300898c23568efb1fb22e79a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-23 22:56:14 +00:00
Bill Yi
80076b90b1 [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: Ibff85baa33e755635d00211a2c18d2d570f0793c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-23 22:55:50 +00:00
Treehugger Robot
3c796f10fe Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-06-23 22:24:59 +00:00
Hao Dong
f24edbfc3b Merge "Fix pattern rotation header text." into udc-qpr-dev am: a7af958f4c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23699586

Change-Id: Ic0639b7b3d5304a2900d6f2b2c1749129c669796
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-23 18:59:21 +00:00
Hao Dong
a7af958f4c Merge "Fix pattern rotation header text." into udc-qpr-dev 2023-06-23 17:57:12 +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
364eb998be Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I9aa9cc04f3cff9f455ced6d6fe8b384c4954b21f
2023-06-22 21:57:59 -07:00
Hao Dong
7461036d68 Merge "Fix require on screen toggle on guest user." into udc-qpr-dev am: 800728a5a6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23714620

Change-Id: I77aa61c6d6f3f52e275754f17e56586e335da2c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-23 03:30:11 +00:00
Hao Dong
35ebdefcd8 Fix pattern rotation header text.
Bug: 278055194
Test: atest ChooseLockPatternTest
Change-Id: I36ec325b46d7a7f583d94dc26f9962cadc3874cd
2023-06-23 02:37:22 +00:00
Hao Dong
800728a5a6 Merge "Fix require on screen toggle on guest user." into udc-qpr-dev 2023-06-23 02:36:48 +00:00
Bill Yi
5dcfd74b68 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24a7a54341 -s ours am: d2fa0c27de -s ours am: df60aeda89 -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: Id49c775b6d0d36cf406d1526b2b9553affdf415c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-23 01:41:32 +00:00
Hao Dong
7068c74788 Merge "Fix delete face button disappear after reenroll" into udc-d1-dev am: 0f63a450a8 am: 02f72c16ae
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23768213

Change-Id: I815fbabdcbb85db29488456b06317a9eb234b8c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-23 01:41:13 +00:00
Bill Yi
2f48b3fbeb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24a7a54341 -s ours am: ced4e8df8b -s ours am: 7f8405f202 -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: I2b81e71cc049626cdf4a118b6bd5892aa8014f1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-23 01:37:47 +00:00
Bill Yi
b6f86a13a1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24a7a54341 -s ours am: d2fa0c27de -s ours am: abce7eb398 -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: If4d2b551f9b4ac10f67e85f263b78a90f49e80c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-23 01:36:20 +00:00
Hao Dong
3f4a489b02 Merge "Fix delete face button disappear after reenroll" into udc-d1-dev am: 0f63a450a8 am: d44eccbc5f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23768213

Change-Id: Id3aaa0b9e529de1dfde98decec6095f79e4b71f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-23 01:36:00 +00:00
Bill Yi
df60aeda89 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24a7a54341 -s ours am: d2fa0c27de -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: I94edf14e689094253de4006030f3a490663445ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-23 00:52:55 +00: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
Hao Dong
02f72c16ae Merge "Fix delete face button disappear after reenroll" into udc-d1-dev am: 0f63a450a8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23768213

Change-Id: I97978a19733bc19904bd7fb72d80955e1f400d3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-23 00:52:35 +00:00
Bill Yi
abce7eb398 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24a7a54341 -s ours am: d2fa0c27de -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: Ib41319892c8e30df912b6b529c02d7cac84249e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-23 00:50:54 +00:00
Hao Dong
d44eccbc5f Merge "Fix delete face button disappear after reenroll" into udc-d1-dev am: 0f63a450a8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23768213

Change-Id: Idc66a1838b701b91affa038a581b1410b78115a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-23 00:50:35 +00:00
Hao Dong
c9a99978f9 Fix require on screen toggle on guest user.
Bug: 286018876
Test: atest FingerprintSettingsFragmentTest
Change-Id: I432ffd3b8b32caeaf7ac8c6bc3c2ee2a0ee53a08
2023-06-23 00:32:32 +00:00
Bill Yi
ced4e8df8b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24a7a54341 -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: I28473ca95c4f26f45811162685f95dfad0d1c57e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-23 00:07:56 +00:00
Bill Yi
d2fa0c27de [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24a7a54341 -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: I452f11e910b1b1c99ed2d8cd06c5915f6df6d1dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-23 00:07:11 +00:00
Hao Dong
0f63a450a8 Merge "Fix delete face button disappear after reenroll" into udc-d1-dev 2023-06-22 23:58:55 +00:00
Bill Yi
24a7a54341 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I8fceb2c2cb46e03d76cab54b1348030cf61b788c
2023-06-22 10:35:13 -07:00
TreeHugger Robot
6377e84290 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 3f85afaad5 -s ours am: 2461b42f22 -s ours am: b30f4fb6ae -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5f7d0a2f2a4aed92da4c8248e71a5e999af82f7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-22 09:41:18 +00:00
Bill Yi
8fa10d8716 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 65122fc3d2 -s ours am: b9ebaae7af -s ours am: b6e9b3a532 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I643064a10167535712fce02a7975f15827217b79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-22 09:41:02 +00:00
Bill Yi
f9d072155d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 588001801a -s ours am: a0c53d9c73 -s ours am: bf69a5d059 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5a14cc5e18bca770c89a140c07769a2a706ac010
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-22 09:40:47 +00:00
TreeHugger Robot
5e98af0a91 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 3f85afaad5 -s ours am: 1485ceaf97 -s ours am: 0e8155050c -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id6213824f2be3ae91dd9bba01f1cdf4368e239fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-22 09:39:42 +00:00
Bill Yi
b76c8a7dd1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 65122fc3d2 -s ours am: 422c0622e8 -s ours am: 8690fea740 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I172e36c3f08496c2d0f12011816e7c242b1b96dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-22 09:39:29 +00:00