Bill Yi
3df6f3fe63
[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: I62fefb7372de3f454ec6adc30e240928cad2f618
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 18:04:24 +00:00
Bill Yi
c25ff8ff49
[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: I521db24cb73bcc39f3b058b45a3fc97397cb514a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 18:04:07 +00:00
TreeHugger Robot
0adac53973
[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: I0b9ea4b0881d39ea38a1165d500fcf886dec8388
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 18:03:06 +00:00
Bill Yi
392e976d77
[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: I971b4060cd41bf69ce821df160ac5d3434bae041
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 18:02:51 +00:00
Bill Yi
4011a37faa
[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: I0a66d2a0bea5d89a31780156c2e9d31356617008
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 18:02:36 +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
0f98a4d1ca
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ie645e16d70b654b0ed4655392f42ffcb4c38a2f5
2022-07-14 13:42:55 -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
Bill Yi
2ff486543a
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I089f4ebab3776b2e32596948e43eb1564f38273d
2022-07-14 13:28:43 -07:00
Bill Yi
e148a29a1c
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I3a97f3d110f4255be27847ab9d25dd758daa29d4
2022-07-14 13:26:48 -07:00
Bill Yi
60b5937fb7
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I5e84134712147a92c064b7e0e85b58c201bb046e
2022-07-14 13:24:54 -07:00
Treehugger Robot
bcc4a3b4e6
Merge "Fix ExtraText lint errors" am: 000bc450b0
am: 91420db7c7
am: 2058af23ac
am: 52afebe91e
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2141272
Change-Id: I29468d623adeb7f25bc4e20dcca7e3e6c3e2509a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-14 12:40:10 +00:00
Treehugger Robot
52afebe91e
Merge "Fix ExtraText lint errors" am: 000bc450b0
am: 91420db7c7
am: 2058af23ac
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2141272
Change-Id: Id7da7c8d7565087f996577689c7515b3094dcf2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-14 12:23:06 +00:00
Treehugger Robot
2058af23ac
Merge "Fix ExtraText lint errors" am: 000bc450b0
am: 91420db7c7
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2141272
Change-Id: I0caf8634598434942ce4e3ecd2bbd3c32adf1fb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-14 11:58:53 +00:00
Treehugger Robot
91420db7c7
Merge "Fix ExtraText lint errors" am: 000bc450b0
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2141272
Change-Id: Ia0f5c48b9581ab8722c06e226acd59e9ac18cde3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-14 11:32:07 +00:00
Treehugger Robot
000bc450b0
Merge "Fix ExtraText lint errors"
2022-07-14 11:14:59 +00:00
Milton Wu
504a659ba5
Run lock before fingerprint enroll
...
Run setOrConfirmCredentialsNow() before enrolling fingerprint for
fingerprint-only device.
Bug: 237433373
Test: atest BiometricEnrollActivityTest
Test: Manually test SUW flows for fingerprint-only device
1. check confirm pin case
2. check choose pin case
3. enable always_finish_activities, check confirm pin case
4. enable always_finish_activities, check choose pin case
Change-Id: I68da429145835fc79f83f3292749088dc25fdeee
2022-07-14 08:40:45 +00:00
Bill Yi
415f1b8706
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Icdb743843e5eeee000e53ea68ae48f5cbff3da14
2022-07-14 01:20:34 -07:00