Automerger Merge Worker
|
73c7e602f6
|
Merge changes from topic "am-04754628637348948b04fab6958e617d" into tm-qpr-dev-plus-aosp
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 8359385233 -s ours am: f20ec29820 -s ours am: 8a300a43df -s ours am: d0695e781f -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 415f1b8706 -s ours am: 6aa3b0a3a9 -s ours am: 617be8295c -s ours am: d8f919c239 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f841a2af4 -s ours am: cb2cb2e72a -s ours am: d1f25e5217 -s ours am: 6ec6ae294e -s ours
|
2022-07-15 18:41:42 +00:00 |
|
TreeHugger Robot
|
5ef8d799fc
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 8359385233 -s ours am: f20ec29820 -s ours am: 8a300a43df -s ours am: d0695e781f -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19287433
Change-Id: I15020d1d61cdbe3c5700a1703840f51a0378aa08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-07-15 18:40:40 +00:00 |
|
TreeHugger Robot
|
fc3718b3d8
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 7d8655936b -s ours am: 3ff66be05a -s ours am: ec4f2a953b -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19294496
Change-Id: If582167d9ab24594a588e5fa6991329a273cfc48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-07-15 18:40:38 +00:00 |
|
Bill Yi
|
f1796a67b3
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 415f1b8706 -s ours am: 6aa3b0a3a9 -s ours am: 617be8295c -s ours am: d8f919c239 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19287433
Change-Id: I334aa0e27cf395cf5982e209a1d4dd33ddabc3c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-07-15 18:40:24 +00:00 |
|
Bill Yi
|
1a29a382e0
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fef55df6ec -s ours am: 84ce084f90 -s ours am: 6f2aa0d0f7 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19294496
Change-Id: I1caa4b5d67d728fb9477a3aaa500746de59fe8fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-07-15 18:40:20 +00:00 |
|
Bill Yi
|
e08f566a87
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f841a2af4 -s ours am: cb2cb2e72a -s ours am: d1f25e5217 -s ours am: 6ec6ae294e -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19287432
Change-Id: I4c8460ed54f752fc8967f2ac188261c2c8c10c54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-07-15 18:40:12 +00:00 |
|
Bill Yi
|
505057189b
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 60b5937fb7 -s ours am: bc5abed2bd -s ours am: ea80c38015 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19293984
Change-Id: I79e0aacf6950d4a18e529e447f678e5e1f7dd23b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-07-15 18:40:03 +00:00 |
|
TreeHugger Robot
|
d0695e781f
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 8359385233 -s ours am: f20ec29820 -s ours am: 8a300a43df -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19287433
Change-Id: I757e5ee6c17971a4062188180abe60e76f4509ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-07-15 18:32:56 +00:00 |
|
Bill Yi
|
d8f919c239
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 415f1b8706 -s ours am: 6aa3b0a3a9 -s ours am: 617be8295c -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19287433
Change-Id: I4ee1e7ab780dc181753b98182397dab315739314
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-07-15 18:32:41 +00:00 |
|
Bill Yi
|
6ec6ae294e
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f841a2af4 -s ours am: cb2cb2e72a -s ours am: d1f25e5217 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19287432
Change-Id: If18bd5eb780e6bbe76a695ef6de2de657955f4c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-07-15 18:32:29 +00:00 |
|
TreeHugger Robot
|
c54a6df09e
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 7d8655936b -s ours am: 188a2c66c1 -s ours am: 4479132675 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19294496
Change-Id: I4cdf25133ab27600135f3b3a3b5e15475ae419c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-07-15 18:14:36 +00:00 |
|
Bill Yi
|
850e3b1531
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fef55df6ec -s ours am: cdd61bac15 -s ours am: da2052f884 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19294496
Change-Id: I8ea786382119c28a9479ff6a7145ce0549842c84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-07-15 18:14:19 +00:00 |
|
Bill Yi
|
e64f69f6cf
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 60b5937fb7 -s ours am: 3050a6cb87 -s ours am: 8ca2243678 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19293984
Change-Id: Ifa4be9dbf2863454f8e9e643de42f8f954da5bf2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-07-15 18:14:03 +00:00 |
|
TreeHugger Robot
|
d39de8723d
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 377685d4a6 -s ours am: fe9539f0a4 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19294505
Change-Id: I95d8cb7517106dba6bb71741ae682e053194dcd4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-07-15 18:12:57 +00:00 |
|
Bill Yi
|
f5b244dab9
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 30c5704504 -s ours am: 9d6d73301d -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19294505
Change-Id: I81f66eea71f54d96f70c34ee93138e643fff7458
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-07-15 18:12:43 +00:00 |
|
Bill Yi
|
a57a4a5d9f
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2ff486543a -s ours am: b7eb3c0448 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19294494
Change-Id: I89c54e6f76d63a1e89cd6d6c8ca9b778547aceeb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-07-15 18:12:28 +00:00 |
|
TreeHugger Robot
|
8a300a43df
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 8359385233 -s ours am: f20ec29820 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19287433
Change-Id: I5ae6a65703afa8f788a107214bb4b64804095e3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-07-15 17:56:24 +00:00 |
|
Bill Yi
|
617be8295c
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 415f1b8706 -s ours am: 6aa3b0a3a9 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19287433
Change-Id: I217b6bffc9e0de61bf00f8291a95d8a2d525243a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-07-15 17:56:08 +00:00 |
|
Bill Yi
|
d1f25e5217
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f841a2af4 -s ours am: cb2cb2e72a -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19287432
Change-Id: I0f33b849986bb6501baa00d4fee74de7617f9e7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-07-15 17:55:55 +00:00 |
|
TreeHugger Robot
|
ec4f2a953b
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 7d8655936b -s ours am: 3ff66be05a -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19294496
Change-Id: I4ba7ef3a40991518ba3261282664a9dfdda9e523
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-07-15 17:54:57 +00:00 |
|
Bill Yi
|
6f2aa0d0f7
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fef55df6ec -s ours am: 84ce084f90 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19294496
Change-Id: I67f6ad3b81dc663a6ab41c510eb0558f9fdc3840
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-07-15 17:54:40 +00:00 |
|
Bill Yi
|
ea80c38015
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 60b5937fb7 -s ours am: bc5abed2bd -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19293984
Change-Id: I748899370ed54bc7947644656b8fece6e81dda2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-07-15 17:54:23 +00:00 |
|
TreeHugger Robot
|
4479132675
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 7d8655936b -s ours am: 188a2c66c1 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19294496
Change-Id: I4d19d7074349e78da6ba23ef7f781968d270e980
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-07-15 17:45:59 +00:00 |
|
Bill Yi
|
da2052f884
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fef55df6ec -s ours am: cdd61bac15 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19294496
Change-Id: Ia975276fc9ef9cc8edb76cdc9ed5f7a761eeb8fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-07-15 17:45:44 +00:00 |
|
Bill Yi
|
8ca2243678
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 60b5937fb7 -s ours am: 3050a6cb87 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19293984
Change-Id: I69eef3df05e16dec54876cc89bdc069747318828
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-07-15 17:45:24 +00:00 |
|
TreeHugger Robot
|
fe9539f0a4
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 377685d4a6 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19294505
Change-Id: Ie5ea5d6931a58e9f21fd9a30b21ae6575c394fc6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-07-15 17:44:19 +00:00 |
|
Bill Yi
|
9d6d73301d
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 30c5704504 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19294505
Change-Id: Ic146ce400d245dd4c6e6a27a26c5094c9f14748f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-07-15 17:44:03 +00:00 |
|
Bill Yi
|
b7eb3c0448
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2ff486543a -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19294494
Change-Id: I80eea9dcf4cae2c3c872fe41d3c1ee8c6536e6d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-07-15 17:43:48 +00:00 |
|
TreeHugger Robot
|
f20ec29820
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 8359385233 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19287433
Change-Id: I7f6106fcdf78ce8f3a335c75a27bf8e794326ee8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-07-15 17:37:18 +00:00 |
|
Bill Yi
|
6aa3b0a3a9
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 415f1b8706 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19287433
Change-Id: I989899b2f11e906218ee445f603d46973e88af05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-07-15 17:37:05 +00:00 |
|
Bill Yi
|
cb2cb2e72a
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f841a2af4 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19287432
Change-Id: I39cd22fa5a5ece6def936a0501f4226b5925a414
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-07-15 17:36:46 +00:00 |
|
TreeHugger Robot
|
8359385233
|
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod
|
2022-07-15 17:29:43 +00:00 |
|
TreeHugger Robot
|
188a2c66c1
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 7d8655936b -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19294496
Change-Id: I07ea1b35c425ddda94d74d61f69d50eac84517b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-07-15 17:29:37 +00:00 |
|
Bill Yi
|
cdd61bac15
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fef55df6ec -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19294496
Change-Id: I43aaa9d814fe81b7bdbcd363f66b214dc7f8949b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-07-15 17:29:19 +00:00 |
|
Bill Yi
|
3050a6cb87
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 60b5937fb7 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19293984
Change-Id: I0697c0805e26144de9fe00eaaf8fee2ad864f7cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-07-15 17:29:02 +00:00 |
|
TreeHugger Robot
|
3ff66be05a
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 7d8655936b -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19294496
Change-Id: Ia7d530db0b0b29d1f927da0ef723360a69a14b55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-07-15 17:25:19 +00:00 |
|
Bill Yi
|
84ce084f90
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fef55df6ec -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19294496
Change-Id: Ib17ef4b92b91a29d269755ff32c20197c18cfb18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-07-15 17:25:03 +00:00 |
|
Bill Yi
|
bc5abed2bd
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 60b5937fb7 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19293984
Change-Id: Ibdf0138afbf959edefbf88629e3d5f79ac2097c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-07-15 17:24:44 +00:00 |
|
TreeHugger Robot
|
377685d4a6
|
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev
|
2022-07-15 17:19:07 +00:00 |
|
TreeHugger Robot
|
7d8655936b
|
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
|
2022-07-15 16:56:40 +00:00 |
|
TreeHugger Robot
|
3928fcabab
|
Merge "Save isCanceled state and restore when rotation" into tm-qpr-dev am: 3028e52501
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19267966
Change-Id: I6072236085c1feec6588d8b06931517086f32d48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-07-15 05:21:45 +00:00 |
|
TreeHugger Robot
|
3028e52501
|
Merge "Save isCanceled state and restore when rotation" into tm-qpr-dev
|
2022-07-15 05:03:40 +00:00 |
|
TreeHugger Robot
|
14f791bf73
|
Merge "Run lock before fingerprint enroll" into tm-qpr-dev am: e49a84480b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19260206
Change-Id: I72fbe236492e87c7b6d23c0de36c8dd307f035e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-07-15 00:43:02 +00:00 |
|
TreeHugger Robot
|
e49a84480b
|
Merge "Run lock before fingerprint enroll" into tm-qpr-dev
|
2022-07-15 00:37:04 +00:00 |
|
TreeHugger Robot
|
f14704504b
|
Merge "Check portal on fingerprint intro page" into tm-qpr-dev am: 9fcf073bab
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19267972
Change-Id: I738b4d76e633f359cdaedc4fee43f0975c60e7e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-07-15 00:33:48 +00:00 |
|
lbill
|
d7f53d4180
|
Save isCanceled state and restore when rotation
- Create mIsCanceled field in FingerprintEnrollEnrolling
- Override onSaveInstanceState and save mIsCanceled state
- onCreate restore mIsCanceled
- shouldStartAutomatically() return mRestoring && !mIsCanceled
- Integrate FingerprintErrorDialog with "try again"-> Clear mIsCanceled
Bug: 237103873
Test: manual enroll UDFPS, and wait for timeout, seeing timeout error
dialog showing above fingerprint enrollment pad.
Change-Id: I3a3010ca12aa0b23fd122a8afc9b82adf5656fb8
|
2022-07-15 08:14:53 +08:00 |
|
TreeHugger Robot
|
9fcf073bab
|
Merge "Check portal on fingerprint intro page" into tm-qpr-dev
|
2022-07-15 00:08:59 +00:00 |
|
Nate Myren
|
b055df3b8c
|
Remove location toggle from privacy controls screen am: d18f11a84f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19281813
Change-Id: I7b2286f4cfbb022ea6cdfffa9ef1b42da6a05062
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-07-14 20:52:30 +00:00 |
|
Bill Yi
|
30c5704504
|
Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ic8eeb16a4833dccdf9924faefd2b2b341ec2d1da
|
2022-07-14 13:47:48 -07:00 |
|
Bill Yi
|
fef55df6ec
|
Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I8d79670567a1f2b81f59e9a447c27fcde72a0c4e
|
2022-07-14 13:38:25 -07:00 |
|