Commit Graph

120929 Commits

Author SHA1 Message Date
YK Hung
34bc5c0382 Merge "Update incompatible charging string based on UXR suggestion" into udc-dev am: ffd306e63a am: f95af758eb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21701046

Change-Id: Ia2d2a97e0f6af26436777b75859d451304f1ef69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 18:11:25 +00:00
TreeHugger Robot
e2ab55b69f Merge "Fix checkcolor_hook error" into udc-dev am: 4b4b0cf83b am: 88bcec84d8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21692788

Change-Id: I051d352b0ebe5f45e9de17922daee786537e498d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 18:05:43 +00:00
Diya Bera
bc393400b4 [automerger skipped] Merge "Learn more updated in Fingerprint Settings for side fps" into tm-qpr-dev am: 47cedbde0a am: f3012c6497 -s ours am: 7cb164d0c1 -s ours am: 69b0c4fe50 -s ours
am skip reason: Merged-In Ia22fcd1289bec85642993b22fe3cb3ebaf647cbd with SHA-1 5faf4eeb8e is already in history

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

Change-Id: I22b8cc9f2031597e536872eb1f93f7010bdb45bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 17:59:29 +00:00
YK Hung
f95af758eb Merge "Update incompatible charging string based on UXR suggestion" into udc-dev am: ffd306e63a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21701046

Change-Id: Ice09e7200bbc0bff6fba713be8b38ea1fbb072b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 17:44:51 +00:00
YK Hung
f7d5e7b613 Merge "Update incompatible charging string based on UXR suggestion" into udc-dev am: ffd306e63a am: 4759c9447f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21701046

Change-Id: I34df51ffc34a30a0ec519b4d1dc8390cd888b600
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 17:44:24 +00:00
TreeHugger Robot
62c1126aa0 Merge "Fix checkcolor_hook error" into udc-dev am: 4b4b0cf83b am: a8ab02ee7f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21692788

Change-Id: I789ca4f985ef959a1cecb8760a2fe0053931a879
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 17:35:52 +00:00
TreeHugger Robot
88bcec84d8 Merge "Fix checkcolor_hook error" into udc-dev am: 4b4b0cf83b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21692788

Change-Id: I10124f01d59d9515f1c230efea1dc2f6dc7d0e94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 17:32:30 +00:00
Diya Bera
3c26b3c6de [automerger skipped] Merge "Learn more updated in Fingerprint Settings for side fps" into tm-qpr-dev am: 47cedbde0a am: f3012c6497 -s ours am: 7cb164d0c1 -s ours am: 4894495f06 -s ours
am skip reason: Merged-In Ia22fcd1289bec85642993b22fe3cb3ebaf647cbd with SHA-1 5faf4eeb8e is already in history

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

Change-Id: I3d6158e5878cb1a2d8e8a17bcea8acd48343fa0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 17:15:48 +00:00
Diya Bera
69b0c4fe50 [automerger skipped] Merge "Learn more updated in Fingerprint Settings for side fps" into tm-qpr-dev am: 47cedbde0a am: f3012c6497 -s ours am: 7cb164d0c1 -s ours
am skip reason: Merged-In Ia22fcd1289bec85642993b22fe3cb3ebaf647cbd with SHA-1 5faf4eeb8e is already in history

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

Change-Id: I88b75092fa5fe59affcfb43b953a9ccf6d61535d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 17:12:25 +00:00
Diya Bera
aff74449ac [automerger skipped] Merge "Removed subtext from side fps enrollment flow" into tm-qpr-dev am: 97f99f5d30 am: afa29d5cb8 -s ours am: 63c145445b -s ours am: 23ed65d348 -s ours
am skip reason: Merged-In Iba4c13e8083ecb92f8033882af9147f14071e726 with SHA-1 7fa342fadb is already in history

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

Change-Id: Ifdbf6a282bb26deec4c64be3a5cf10a83d532dfb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 17:10:27 +00:00
Chris Li
64f32a3577 Update EmbeddingAspectRatio to the latest am: 81ee016a6e am: 32d271dfb3 am: aabd2ee494 am: 6cc9ace3d4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21673464

Change-Id: I0780870cab370752b628b506c663528a7a53acd7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 17:09:05 +00:00
YK Hung
4759c9447f Merge "Update incompatible charging string based on UXR suggestion" into udc-dev am: ffd306e63a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21701046

Change-Id: Ic91d53898891a9140f4844e9567fba6c170acd20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 16:59:47 +00:00
TreeHugger Robot
a8ab02ee7f Merge "Fix checkcolor_hook error" into udc-dev am: 4b4b0cf83b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21692788

Change-Id: I2858864b51bc6b8e3f75b667c8f2e0be609bb4aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 16:57:08 +00:00
Diya Bera
4894495f06 [automerger skipped] Merge "Learn more updated in Fingerprint Settings for side fps" into tm-qpr-dev am: 47cedbde0a am: f3012c6497 -s ours am: 7cb164d0c1 -s ours
am skip reason: Merged-In Ia22fcd1289bec85642993b22fe3cb3ebaf647cbd with SHA-1 5faf4eeb8e is already in history

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

Change-Id: I98e087a4e69332a89e18ae1946c893c4d5f798ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 16:56:51 +00:00
YK Hung
ffd306e63a Merge "Update incompatible charging string based on UXR suggestion" into udc-dev 2023-03-03 03:34:16 +00:00
Diya Bera
737308e7ee [automerger skipped] Merge "Removed subtext from side fps enrollment flow" into tm-qpr-dev am: 97f99f5d30 am: afa29d5cb8 -s ours am: 63c145445b -s ours am: cd9bfa0c8b -s ours
am skip reason: Merged-In Iba4c13e8083ecb92f8033882af9147f14071e726 with SHA-1 7fa342fadb is already in history

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

Change-Id: I36b534782fd2ba1196f1a4d5846f61b6e606f431
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 02:22:07 +00:00
Diya Bera
23ed65d348 [automerger skipped] Merge "Removed subtext from side fps enrollment flow" into tm-qpr-dev am: 97f99f5d30 am: afa29d5cb8 -s ours am: 63c145445b -s ours
am skip reason: Merged-In Iba4c13e8083ecb92f8033882af9147f14071e726 with SHA-1 7fa342fadb is already in history

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

Change-Id: I85b3b28b9b3ed4bc7adc5ce1d8b2b5db92a09d30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 02:22:01 +00:00
Chris Li
a87f619865 Update EmbeddingAspectRatio to the latest am: 81ee016a6e am: 32d271dfb3 am: aabd2ee494 am: 01fa5fa6aa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21673464

Change-Id: I43beb7af577abf75c8526e7b025a52d8c4a54ee7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 02:21:47 +00:00
Diya Bera
cd9bfa0c8b [automerger skipped] Merge "Removed subtext from side fps enrollment flow" into tm-qpr-dev am: 97f99f5d30 am: afa29d5cb8 -s ours am: 63c145445b -s ours
am skip reason: Merged-In Iba4c13e8083ecb92f8033882af9147f14071e726 with SHA-1 7fa342fadb is already in history

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

Change-Id: Id571f7c562a5ea1c2c9a627f6dbc1576fbff4b03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 02:18:04 +00:00
Chris Li
6cc9ace3d4 Update EmbeddingAspectRatio to the latest am: 81ee016a6e am: 32d271dfb3 am: aabd2ee494
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21673464

Change-Id: If0108316abbd7f185002d821271d603b78cda7bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 02:08:05 +00:00
Chris Li
01fa5fa6aa Update EmbeddingAspectRatio to the latest am: 81ee016a6e am: 32d271dfb3 am: aabd2ee494
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21673464

Change-Id: Ia2f0149bf4bc0231c86198cc870e63cd8d413603
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 02:00:42 +00:00
TreeHugger Robot
4b4b0cf83b Merge "Fix checkcolor_hook error" into udc-dev 2023-03-03 01:52:59 +00:00
Diya Bera
7cb164d0c1 [automerger skipped] Merge "Learn more updated in Fingerprint Settings for side fps" into tm-qpr-dev am: 47cedbde0a am: f3012c6497 -s ours
am skip reason: Merged-In Ia22fcd1289bec85642993b22fe3cb3ebaf647cbd with SHA-1 5faf4eeb8e is already in history

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

Change-Id: Ieed83b86abaedc2c6f49bc859ee3c51dde81763e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 01:37:20 +00:00
Diya Bera
63c145445b [automerger skipped] Merge "Removed subtext from side fps enrollment flow" into tm-qpr-dev am: 97f99f5d30 am: afa29d5cb8 -s ours
am skip reason: Merged-In Iba4c13e8083ecb92f8033882af9147f14071e726 with SHA-1 7fa342fadb is already in history

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

Change-Id: Ia1f47a216186d1819d70dfaa89af04a6e3341edc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 01:37:05 +00:00
Diya Bera
f3012c6497 Merge "Learn more updated in Fingerprint Settings for side fps" into tm-qpr-dev am: 47cedbde0a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21593025

Change-Id: Ic8b8eea0c25961ccc05b3d344161e1a194104b3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 01:26:01 +00:00
Diya Bera
afa29d5cb8 Merge "Removed subtext from side fps enrollment flow" into tm-qpr-dev am: 97f99f5d30
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21613842

Change-Id: Ia2a62797dd783366a5d2df4494a25d748fac7995
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 01:24:11 +00:00
Chris Li
aabd2ee494 Update EmbeddingAspectRatio to the latest am: 81ee016a6e am: 32d271dfb3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21673464

Change-Id: I59f466f5c34469e77455ef7332cd14237ac4162c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 01:20:54 +00:00
Diya Bera
47cedbde0a Merge "Learn more updated in Fingerprint Settings for side fps" into tm-qpr-dev 2023-03-02 22:21:12 +00:00
Diya Bera
97f99f5d30 Merge "Removed subtext from side fps enrollment flow" into tm-qpr-dev 2023-03-02 21:22:46 +00:00
Chris Li
32d271dfb3 Update EmbeddingAspectRatio to the latest am: 81ee016a6e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21673464

Change-Id: I45ffde90d1b91b709b6e00622a789722c7cd750f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-02 20:46:57 +00:00
Diya Bera
25e20cb82a Merge "Learn more updated in Fingerprint Settings for side fps" into udc-dev am: 4c3ac9b994 am: 27e77d4f8c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21611408

Change-Id: Iddfaf8a086cc113b137e074247c4fd33edd4e375
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-02 20:32:47 +00:00
Diya Bera
2cf85af3d0 Merge "Learn more updated in Fingerprint Settings for side fps" into udc-dev am: 4c3ac9b994 am: 4afe665577
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21611408

Change-Id: I103292554e98ea2fd5a3fdd3f09f644bbf19ad80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-02 20:28:01 +00:00
Diya Bera
4afe665577 Merge "Learn more updated in Fingerprint Settings for side fps" into udc-dev am: 4c3ac9b994
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21611408

Change-Id: Ic344db9a90e1266de105ebcc4c7ad9bc8f7f4ff0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-02 19:31:52 +00:00
Diya Bera
27e77d4f8c Merge "Learn more updated in Fingerprint Settings for side fps" into udc-dev am: 4c3ac9b994
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21611408

Change-Id: I4bcb7c7d27561d4ec2272392bd37a812a1011e2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-02 19:31:47 +00:00
Diya Bera
961b32ca28 Learn more updated in Fingerprint Settings for side fps
Test: Manual - Go to Fingerprint Settings and check the string
Bug: 258338293
Change-Id: Ia22fcd1289bec85642993b22fe3cb3ebaf647cbd
Merged-in: Ia22fcd1289bec85642993b22fe3cb3ebaf647cbd
2023-03-02 19:09:34 +00:00
Diya Bera
4c3ac9b994 Merge "Learn more updated in Fingerprint Settings for side fps" into udc-dev 2023-03-02 19:09:23 +00:00
Diya Bera
327eaf16fb Removed subtext from side fps enrollment flow
Test: Manual (Try to enroll your fingerprint in a side fps device, and
observe that there is no subtext in landscape mode)
Bug: 267271891

Change-Id: Iba4c13e8083ecb92f8033882af9147f14071e726
Merged-in: Iba4c13e8083ecb92f8033882af9147f14071e726
2023-03-02 18:42:02 +00:00
Diya Bera
33caf6771e Merge "Removed subtext from side fps enrollment flow" into udc-dev am: 36e41dc985 am: a2c16a2643
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21673465

Change-Id: I13b8a7dc465ccb70bd82386b48894e5014429e03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-02 18:01:26 +00:00
Jason Chang
e07df9ce57 Merge "(2/2) Fix No clear steps for "re-enroll face unlock" into udc-dev am: a441922bdd am: 081b7c63d5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21598459

Change-Id: I78d1567ff34e9404e6117123c6623589ca6a3a2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-02 18:00:55 +00:00
Diya Bera
aacb08b441 Merge "Removed subtext from side fps enrollment flow" into udc-dev am: 36e41dc985 am: 4f9d82de86
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21673465

Change-Id: I4f4ea29ca7080f143bc7772424c8aadaa8162d8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-02 17:59:52 +00:00
Jason Chang
9bc3bd1b34 Merge "(2/2) Fix No clear steps for "re-enroll face unlock" into udc-dev am: a441922bdd am: 7f788db206
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21598459

Change-Id: I70503ccc067405ce8592e7619e25a85754f32f7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-02 17:59:15 +00:00
Diya Bera
a2c16a2643 Merge "Removed subtext from side fps enrollment flow" into udc-dev am: 36e41dc985
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21673465

Change-Id: I7202f15c530fe3c7f5ae94d011b12d83717db2d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-02 17:27:04 +00:00
Diya Bera
4f9d82de86 Merge "Removed subtext from side fps enrollment flow" into udc-dev am: 36e41dc985
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21673465

Change-Id: I7a156bc0041bedecd63978fac1097d5c8d5c9141
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-02 17:26:53 +00:00
Diya Bera
36e41dc985 Merge "Removed subtext from side fps enrollment flow" into udc-dev 2023-03-02 17:16:31 +00:00
Jason Chang
7f788db206 Merge "(2/2) Fix No clear steps for "re-enroll face unlock" into udc-dev am: a441922bdd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21598459

Change-Id: I1fc12a04726c86a53c87611ff7304014111fe2be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-02 17:07:59 +00:00
Jason Chang
081b7c63d5 Merge "(2/2) Fix No clear steps for "re-enroll face unlock" into udc-dev am: a441922bdd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21598459

Change-Id: Icae2ef1d3d4214d1accbaf861a35ee0f0bbb460a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-02 17:07:50 +00:00
ykhung
03442225a3 Update incompatible charging string based on UXR suggestion
Bug: 246960554
Test: atest
Change-Id: I19ed65d17a538bf6c3c95a121d699e4a1a8ca7b1
2023-03-03 00:50:59 +08:00
Jason Chang
a441922bdd Merge "(2/2) Fix No clear steps for "re-enroll face unlock" into udc-dev 2023-03-02 16:24:16 +00:00
Chris Li
81ee016a6e Update EmbeddingAspectRatio to the latest
alwaysAllow() is changed to ALWAYS_ALLOW per API Council feedback.

Bug: 270160592
Test: build
Change-Id: I44c7e97932456ec5b5bb0339ee2ee060cb6e42e0
(cherry picked from commit af2b07b248)
(cherry picked from commit 1092486873)
2023-03-02 15:56:45 +00:00
Vincent Wang
0d29ea83cb Merge "Fix Incorrect lottie status on the beginning of enrolling UDFPS" into udc-dev am: 98819227f1 am: ce2ee1bbc4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21692082

Change-Id: Ia9f3bb640f2022a833391d4ebd59004e3cc7963b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-02 14:03:03 +00:00