Commit Graph

111328 Commits

Author SHA1 Message Date
TreeHugger Robot
8bb6bc8a0b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 8be819762f -s ours am: 8c54572db8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5580170f4cb35fe965148e8df4d8373e65042320
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 03:45:18 +00:00
Bill Yi
f28e3def27 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fe71b2e76c -s ours am: 7e372d0d7b -s ours
am skip reason: subject contains skip directive

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

Change-Id: Icdca737388d965b3d0cfa6144d6b8e5fd0481544
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 03:45:11 +00:00
TreeHugger Robot
495824f000 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 8be819762f -s ours am: 8c54572db8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I938d8b32df6df00b62ecb99e57382d4228b66018
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 03:45:11 +00:00
Bill Yi
2b3c76edef [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fe71b2e76c -s ours am: 7e372d0d7b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8aa035cca665c4c484a107260d67002e76a1c069
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 03:45:03 +00:00
SongFerngWang
ae28c39ed6 [Setting crash] The dialog is null am: 8514ff65eb am: c69ee75a64 am: d581334f58 am: 04e6e54503
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18792471

Change-Id: I0e72b7167d79e820615ce05b776b10a91eab540e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 03:44:48 +00:00
TreeHugger Robot
b18d91f718 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-06-09 03:39:17 +00:00
TreeHugger Robot
259a096de4 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-06-09 03:39:17 +00:00
TreeHugger Robot
c74ba215e1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: f700b7398c -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib6a2fed4706a6321ada1d4e80254fe41c0fa9dfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 03:03:33 +00:00
Bill Yi
1dc3bda569 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d98e536863 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I12a625a8e7669261337fab6b50f614a89e361d1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 03:03:30 +00:00
TreeHugger Robot
97f3c2d264 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 8be819762f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I31d58d245c771e553bda2e4004c35c635066a68d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 03:03:19 +00:00
TreeHugger Robot
de2f136db2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: f700b7398c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4d20b340b1e2c99600d9f65be2a9dd4d39665065
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 03:03:12 +00:00
Bill Yi
86a359f724 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fe71b2e76c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9a784cc2acfce0271b69a9139e1358314a299dd0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 03:03:09 +00:00
Bill Yi
ddb8e910fd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d98e536863 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3283a18c41f6831e88aba3e47c2f3b8f1f94c2e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 03:03:08 +00:00
TreeHugger Robot
7d9636054e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: f700b7398c -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibd871494793e87931504a1700523d7daf82e7919
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 03:03:00 +00:00
TreeHugger Robot
8c54572db8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 8be819762f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I83eb11ff5ef39ab26f20b32ec86a0d5ab88b8995
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 03:02:58 +00:00
Bill Yi
1ad8ccd199 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d98e536863 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I696be58f56a6ca022b40c07b2e03653aefa04404
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 03:02:51 +00:00
Bill Yi
7e372d0d7b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fe71b2e76c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I63dc3cd8206c7addf7ff7497b0d26f0fd4e3bdaa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 03:02:47 +00:00
TreeHugger Robot
72a681dbe4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 8be819762f -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifbbc6bf130ea62a0f5f82acc275b2c0af17fe8c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 03:02:39 +00:00
Bill Yi
a658060c06 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fe71b2e76c -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia96ac0fb6ca1bdda13d1bae629d7e1a9a6a63f21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 03:02:35 +00:00
Automerger Merge Worker
8d8064671b Merge "Merge "Unable to enable the removable esim" into tm-dev am: be1b37ae2b am: 40379dd9d4" into tm-d1-dev-plus-aosp am: 955397f7ca
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18714967

Change-Id: I67503faa174c3d753b72cdacefa8a6fc4d45b2f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 03:00:05 +00:00
SongFerng Wang
ff7043c477 Merge "Unable to enable the removable esim" into tm-dev am: be1b37ae2b am: 8425062cef am: 506f08b469
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18714967

Change-Id: Ib0da472815518208ed5d519de8bc90184900cb15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 02:59:56 +00:00
Automerger Merge Worker
0bd9f25eba Merge "[Setting crash] The dialog is null am: 8514ff65eb am: b6bd4143cd" into tm-d1-dev-plus-aosp am: d5bcf3fd1d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18792471

Change-Id: I8ea83f95b0f8f3eac49e310689cfac5f68d8d349
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 02:59:49 +00:00
SongFerngWang
9804194142 [Setting crash] The dialog is null am: 8514ff65eb am: c69ee75a64 am: b8e8f9d524
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18792471

Change-Id: Ic90b4d15492c643d7787f58e0863209cf3daceff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 02:59:30 +00:00
SongFerng Wang
1ff89ae4bf Merge "Unable to enable the removable esim" into tm-dev am: be1b37ae2b am: 8425062cef am: cac60c3548
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18714967

Change-Id: I8d00c2b3133c33fcaf7df2d4756a31f057b4b122
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 02:59:06 +00:00
SongFerngWang
04e6e54503 [Setting crash] The dialog is null am: 8514ff65eb am: c69ee75a64 am: d581334f58
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18792471

Change-Id: I6e2dc8f7459b56e7da7e839eeb8155787e8fabfd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 02:58:51 +00:00
Automerger Merge Worker
955397f7ca Merge "Merge "Unable to enable the removable esim" into tm-dev am: be1b37ae2b am: 40379dd9d4" into tm-d1-dev-plus-aosp 2022-06-09 02:43:06 +00:00
SongFerng Wang
26e4bc3385 Merge "Unable to enable the removable esim" into tm-dev am: be1b37ae2b am: 40379dd9d4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18714967

Change-Id: I1e9704393a31afba4dc045b5f8a0cac01cc05e36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 02:43:03 +00:00
SongFerng Wang
506f08b469 Merge "Unable to enable the removable esim" into tm-dev am: be1b37ae2b am: 8425062cef
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18714967

Change-Id: Ie02de937a62231f6bf41218ded791204046c59ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 02:43:01 +00:00
Automerger Merge Worker
d5bcf3fd1d Merge "[Setting crash] The dialog is null am: 8514ff65eb am: b6bd4143cd" into tm-d1-dev-plus-aosp 2022-06-09 02:42:57 +00:00
SongFerng Wang
cac60c3548 Merge "Unable to enable the removable esim" into tm-dev am: be1b37ae2b am: 8425062cef
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18714967

Change-Id: Iaf160129453409905112ff321ab35694c3383b07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 02:42:56 +00:00
SongFerngWang
b8e8f9d524 [Setting crash] The dialog is null am: 8514ff65eb am: c69ee75a64
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18792471

Change-Id: Ic8dd54e2aa27f8d62e872f0c73e13ea6ab953fb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 02:42:53 +00:00
SongFerngWang
d0c7fd9edd [Setting crash] The dialog is null am: 8514ff65eb am: b6bd4143cd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18792471

Change-Id: I0b408ceccfb1fbe774750a1a4e8582226a0ce069
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 02:42:52 +00:00
SongFerngWang
d581334f58 [Setting crash] The dialog is null am: 8514ff65eb am: c69ee75a64
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18792471

Change-Id: Iba704f625707a2eb9e6ae90f648ce335c9201e2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 02:42:49 +00:00
TreeHugger Robot
f700b7398c Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-06-09 02:39:03 +00:00
TreeHugger Robot
8be819762f Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-06-09 02:39:03 +00:00
SongFerng Wang
8425062cef Merge "Unable to enable the removable esim" into tm-dev am: be1b37ae2b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18714967

Change-Id: Ic113ffc982f64c332b5269275e47941d6d5c2245
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 02:07:10 +00:00
SongFerngWang
c69ee75a64 [Setting crash] The dialog is null am: 8514ff65eb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18792471

Change-Id: Ib697f1fddcb8b77b36d2dc95cfa34331ded9bf14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 02:06:56 +00:00
SongFerng Wang
2ab5c395ac Merge "Unable to enable the removable esim" into tm-dev am: be1b37ae2b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18714967

Change-Id: I5259dc6fffa80297f28fb0341309d0254940d0b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 02:06:04 +00:00
SongFerngWang
a49335241a [Setting crash] The dialog is null am: 8514ff65eb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18792471

Change-Id: I287c5f4bbaed7739b07b3f9ed50b229061f994e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 02:05:44 +00:00
SongFerng Wang
40379dd9d4 Merge "Unable to enable the removable esim" into tm-dev am: be1b37ae2b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18714967

Change-Id: I6120361d42db676e02991dafd707dfa1b4188777
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 02:05:41 +00:00
SongFerngWang
b6bd4143cd [Setting crash] The dialog is null am: 8514ff65eb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18792471

Change-Id: Ie9e4e661bb66dcb898b2f98435989ab838d37713
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 02:05:21 +00:00
SongFerng Wang
be1b37ae2b Merge "Unable to enable the removable esim" into tm-dev 2022-06-09 01:30:44 +00:00
Joshua McCloskey
0eb278b245 Added consent message for FaceAuth enrollment.
Test: Manual.
Fixes: 234663447
Change-Id: Iefd9b10eb634ed271f57b82e2a40be08dbbc1f61
2022-06-08 22:02:19 +00:00
Bill Yi
d98e536863 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I650e4197e0aff594a172c01f04cffd4092b7467d
2022-06-08 14:12:47 -07:00
Bill Yi
fe71b2e76c Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I4111bd9a5feee6d6a8b5db7861d622ea893515e2
2022-06-08 14:08:50 -07:00
Bill Yi
bae003932e Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I0551317a60356a451fc2001bc1db2c368140a7ba
2022-06-08 14:05:47 -07:00
Bill Yi
28e9f3fed0 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I4252cc2a783ef050a480c1b08c1954afcdd58d12
2022-06-08 14:01:41 -07:00
Joshua McCloskey
548f6f36c1 Add functionality to restart fp enrollment.
Test: Tested manually via SUW that restarting enrollment works
as expected.
Test: Tested manually via settings that restarting enrollment
works as expected.
Fixes: 234887288

Change-Id: I815392269da786d2dfd157267919a09281af6277
2022-06-08 21:00:59 +00:00
Joshua McCloskey
77452db3f9 Updated FP enroll confirmation string
Test: Verified correct string shows after FP enrollment.
Fixes: 234183906
Change-Id: I57e7ce836d4dc5ad2caf198aa59738f64dc4c049
2022-06-08 20:59:36 +00:00
Bill Yi
477cf091a1 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-06-08 14:34:42 +00:00