Commit Graph

131661 Commits

Author SHA1 Message Date
Bill Yi
2b6991fe3a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 28cf36e37d -s ours am: 2736439ffe -s ours am: ebe1a71e09 -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: I2f00878e92b4d6e4d2a4290da3be7281d7188517
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-24 00:33:22 +00:00
Bill Yi
bfd348ac3a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d772bd36b1 -s ours am: 80076b90b1 -s ours am: 756972e97a -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: Ida1e3ff65eb14246281d66ab2c555b8fc8b6a711
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-24 00:33:11 +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
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
960a3dacbf [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 364eb998be -s ours am: aa006392a2 -s ours am: 0676acb354 -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: Ia06076c0e6c2812764e5db0ad91966250bffc52e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-24 00:16:14 +00:00
Bill Yi
bcec7738d4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e2abc0ab7a -s ours am: a35176545a -s ours am: b85ab40772 -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: I6b764ce85936210c350e7ed1654f8b21b8375896
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-24 00:15:28 +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
c02897d6a9 [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: If25ef7cfa3408e664db2f506304d2c8ec7a665b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-24 00:10:27 +00:00
Bill Yi
0676acb354 [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: I491567c8910ba71c883470e476ad627923be5af0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-24 00:09:24 +00:00
Bill Yi
b85ab40772 [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: Ibefe2f9d9e0eacc90a16d7ec2bace8601971b584
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-24 00:07:00 +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
6dd5206cab [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: I43e0811d69dd11fb179f4bb5ba187df146ee20c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-24 00:06:41 +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
af36dfb674 Merge "Fix pattern rotation header text." into udc-qpr-dev am: a7af958f4c am: f24edbfc3b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23699586

Change-Id: I6e1cd3c3b1965db0da12bd4115fd2e1c20858435
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-23 19:41:57 +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
c9ef01aae5 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: If5084da2a965a60877df3388703adaa94792712e
2023-06-23 06:45:01 -07:00
Bill Yi
fb9be15126 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I449b3b442824c21edc1db831bb5aa0956d1b5c6d
2023-06-23 06:43:39 -07:00
Bill Yi
6a2d395a4c Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I33f9c6778e44fe0b391dac3a134aab87aec5815c
2023-06-23 06:35:05 -07:00
Bill Yi
4d5e205eb4 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: If1c6cb268c4a63baf1be0db6bb833b72c66f140f
2023-06-23 06:32:34 -07:00
Bill Yi
137f4ad8fb Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ia4bd85ca02e780613b9973b4dc188e6b761972e5
2023-06-23 06:27:11 -07: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
Hao Dong
59a4bf3565 Merge "Fix require on screen toggle on guest user." into udc-qpr-dev am: 800728a5a6 am: 7461036d68
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23714620

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

Change-Id: Ibc76f32f310cac1beda8d7b4391414e7385c64ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-23 02:49:35 +00:00
Bill Yi
ad101066fa [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24a7a54341 -s ours am: ced4e8df8b -s ours am: 7f8405f202 -s ours am: 2f48b3fbeb -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: If721372ab10ab38f8b485edec89a27f3c8ae953a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-23 02:48:03 +00:00
Automerger Merge Worker
6e0b42c750 Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24a7a54341 -s ours am: d2fa0c27de -s ours am: abce7eb398 -s ours am: b6f86a13a1 -s ours" 2023-06-23 02:46:31 +00:00
Bill Yi
41314838c5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24a7a54341 -s ours am: d2fa0c27de -s ours am: abce7eb398 -s ours am: b6f86a13a1 -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: I784c78d3056f2d7448c01beb876ba777455d2a3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-23 02:45:51 +00:00
Bill Yi
fb0ee6000c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24a7a54341 -s ours am: 000297ad9a -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: Icad720aebac5b4fa314befe15d19a07f720f2f97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-23 02:45:42 +00:00
Hao Dong
70c833b8a2 Merge "Fix delete face button disappear after reenroll" into udc-d1-dev am: 0f63a450a8 am: d44eccbc5f am: 3f4a489b02
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23768213

Change-Id: Icf8b4f61424f79b4599c530d1aefe88d6cd6a795
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-23 02:45:31 +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