Commit Graph

126742 Commits

Author SHA1 Message Date
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
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
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
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
Vania Januar
a425247076 Clarify that enabling Notes role requires reboot in preference summary
Bug: 288387225
Change-Id: Id07e3b188442c6f4695b43d62b02ea8465d76a7e
Test: only a string change
2023-06-22 10:12:30 +00: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
Bill Yi
c6ca20ad8e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 588001801a -s ours am: 121dcd4d85 -s ours am: 1129578e20 -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: I29ab4bb50df1984499623039fd88d566b83103f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-22 09:39:10 +00:00
TreeHugger Robot
65d2a5bb1d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 3f85afaad5 -s ours am: 2461b42f22 -s ours am: 0bc2775be5 -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: I94cde4fdfb78ea5d3ca113e5c179523b23474995
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-22 09:35:33 +00:00
Bill Yi
1e57556086 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 65122fc3d2 -s ours am: b9ebaae7af -s ours am: 6ac2ee3478 -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: I61de6768e85c1068befa3b4ecc16fbb86e279986
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-22 09:35:20 +00:00
Bill Yi
99a70a764a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 588001801a -s ours am: a0c53d9c73 -s ours am: ef507ad201 -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: I1f73473726d0d3d406f8edeb61d2a4d6341cdc83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-22 09:35:01 +00:00
TreeHugger Robot
0e8155050c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 3f85afaad5 -s ours am: 1485ceaf97 -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: I5f739553db37969ad0fc7434774e955ad1d0c24f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-22 08:59:05 +00:00
Bill Yi
8690fea740 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 65122fc3d2 -s ours am: 422c0622e8 -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: I60b49aaa34df83762e56a7743600c6032407b5ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-22 08:58:54 +00:00
Bill Yi
1129578e20 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 588001801a -s ours am: 121dcd4d85 -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: I1cd68986ddf7dc8f99151b7c14c0ba8029d67d5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-22 08:58:33 +00:00
TreeHugger Robot
b30f4fb6ae [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 3f85afaad5 -s ours am: 2461b42f22 -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: I7dbcdb83d522d22d65742860691e66c762248a7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-22 08:54:22 +00:00
Bill Yi
b6e9b3a532 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 65122fc3d2 -s ours am: b9ebaae7af -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: I90cd7323c3ec83db0a924b0014159042feb7e0ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-22 08:54:05 +00:00
Bill Yi
bf69a5d059 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 588001801a -s ours am: a0c53d9c73 -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: I7234ec198e05f527fae10590cea6c66b4754f250
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-22 08:53:53 +00:00
TreeHugger Robot
0bc2775be5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 3f85afaad5 -s ours am: 2461b42f22 -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: I19e300e2539596017a10522a83594a465359bdf2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-22 08:50:52 +00:00
Bill Yi
6ac2ee3478 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 65122fc3d2 -s ours am: b9ebaae7af -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: I05a0c0cd78502c7a2a97ca05a1d5c00c26d35b2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-22 08:50:39 +00:00
Bill Yi
ef507ad201 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 588001801a -s ours am: a0c53d9c73 -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: I0a53134f1c7b5b9267eb98157a8678ba19c64a18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-22 08:50:20 +00:00
TreeHugger Robot
2461b42f22 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 3f85afaad5 -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: Ib99ea17012fbce64cda4b657b89941680fe34127
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-22 08:11:33 +00:00
Bill Yi
b9ebaae7af [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 65122fc3d2 -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: I365f1efdc1ea9a7cb8affb6aecb77dd497eecd89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-22 08:11:21 +00:00
Bill Yi
a0c53d9c73 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 588001801a -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: Ic8c35b629548b57cf3363f2bd9a04611601af76a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-22 08:11:00 +00:00
TreeHugger Robot
1485ceaf97 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 3f85afaad5 -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: I17a6c8a571b4a0b7d943dfd710cde0f18d03da39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-22 08:09:42 +00:00