Beverly Tai
9e41ed6499
Merge "Remove unused dimen auth_ripple_alpha_in_duration" into udc-dev am: b1482ebe4e
am: 679dd121ef
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/22200424
Change-Id: Ic7bf0af876990f14f5dfe084aa7bb43a43aa1581
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 18:40:33 +00:00
Beverly Tai
b5735827da
Merge "Remove unused dimen auth_ripple_alpha_in_duration" into udc-dev am: b1482ebe4e
am: 55f27462f7
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/22200424
Change-Id: I7a1f61dacfe3436c0b93a1f2fb5f0429649c97fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 18:32:49 +00:00
Beverly Tai
679dd121ef
Merge "Remove unused dimen auth_ripple_alpha_in_duration" into udc-dev am: b1482ebe4e
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/22200424
Change-Id: Iba5e6635c684e2627520eb4de62369dd7ab23d01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 18:29:03 +00:00
Android Build Coastguard Worker
b82eea3684
[coastguard skipped] Merge sparse cherrypicks from sparse-9719927-L87300000959339500 into tm-qpr2-release.
...
COASTGUARD_SKIP: Ieecf6c076245eab8eff5628c386dd220be4306bc
COASTGUARD_SKIP: I28a7b0dde48c391e6502ddf9877a7a1e66b7dc7a
COASTGUARD_SKIP: If9eba1862e49fe31462b8f114b459c21e95d4549
Change-Id: I797b9b17ac593f1450bf893ed55fadae927a4df6
2023-03-23 17:54:23 +00:00
Beverly Tai
55f27462f7
Merge "Remove unused dimen auth_ripple_alpha_in_duration" into udc-dev am: b1482ebe4e
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/22200424
Change-Id: I23a6aa2c162ae1bd2285dda5e05bc71cff9aaf02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 17:48:41 +00:00
Android Build Coastguard Worker
2a1e033915
Merge cherrypicks of ['googleplex-android-review.googlesource.com/21693196', 'googleplex-android-review.googlesource.com/22078385'] into sparse-9719927-L87300000959339500.
...
SPARSE_CHANGE: If9eba1862e49fe31462b8f114b459c21e95d4549
SPARSE_CHANGE: I28a7b0dde48c391e6502ddf9877a7a1e66b7dc7a
Change-Id: Ieecf6c076245eab8eff5628c386dd220be4306bc
2023-03-23 17:47:07 +00:00
Steve Berbary
9c01301e79
Update bluejay SVN to 31
...
Bug: 272844037
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:de230640ea29f6d71f460dbad737aab2c4ed3611 )
Merged-In: I28a7b0dde48c391e6502ddf9877a7a1e66b7dc7a
Change-Id: I28a7b0dde48c391e6502ddf9877a7a1e66b7dc7a
2023-03-23 17:44:05 +00:00
Steve Berbary
501f606118
Update bluejay SVN to 30
...
Bug: 268558932
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:e5ddd8edf2a90ef2ea78b0de8dbd253669e4f7e8 )
Merged-In: If9eba1862e49fe31462b8f114b459c21e95d4549
Change-Id: If9eba1862e49fe31462b8f114b459c21e95d4549
2023-03-23 17:43:58 +00:00
Beverly Tai
b1482ebe4e
Merge "Remove unused dimen auth_ripple_alpha_in_duration" into udc-dev
2023-03-23 17:42:12 +00:00
chenkris
54644ec14c
Move udfps antispoof property to common g7 folder
...
Bug: 270657514
Test: authenticate fake finger
Change-Id: Ie67c13f6ab9e420b66a8e1dc77a9b27fcde8b6e6
2023-03-23 07:43:51 +00:00
Chris Paulo
ff3db7ecdf
Merge "device/bluejay: Add adaptive haptics props" into udc-dev am: 2cde2eea98
am: 959c69113d
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/21806659
Change-Id: I68440d78d1d3acba485a079d8a8e8e906d1bd108
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-22 23:24:16 +00:00
Chris Paulo
46bc30e044
Merge "device/bluejay: Add adaptive haptics props" into udc-dev am: 2cde2eea98
am: ef8e14b041
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/21806659
Change-Id: I77988abb3b92127f84e0cee941a1ac21ff897a7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-22 23:17:22 +00:00
Chris Paulo
959c69113d
Merge "device/bluejay: Add adaptive haptics props" into udc-dev am: 2cde2eea98
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/21806659
Change-Id: Id2d1e415c446664b0b85a0a0e77237f0d77387d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-22 22:37:58 +00:00
Chris Paulo
ef8e14b041
Merge "device/bluejay: Add adaptive haptics props" into udc-dev am: 2cde2eea98
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/21806659
Change-Id: If1df761089f6c1f20a26ca7141e70adedf05ee06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-22 22:37:56 +00:00
Chris Paulo
2cde2eea98
Merge "device/bluejay: Add adaptive haptics props" into udc-dev
2023-03-22 21:58:49 +00:00
Beverly
6bac44096a
Remove unused dimen auth_ripple_alpha_in_duration
...
Bug: 274785453
Test: device builds
Change-Id: I256a62c02ba499a43ded9d6c8cf84df7be11a0ae
2023-03-22 18:23:16 +00:00
Android Build Coastguard Worker
87d48b5f07
[coastguard skipped] Merge sparse cherrypicks from sparse-9719927-L98000000959299536 into tm-qpr2-release.
...
COASTGUARD_SKIP: I28a7b0dde48c391e6502ddf9877a7a1e66b7dc7a
COASTGUARD_SKIP: I0cea8c12d9f6903e82d2322a05a878d12c198196
COASTGUARD_SKIP: If9eba1862e49fe31462b8f114b459c21e95d4549
Change-Id: I80c6d8cdb213eaa26132e9cd05b5185540adbe4c
2023-03-22 04:20:42 +00:00
Android Build Coastguard Worker
ff938fd142
Merge cherrypicks of ['googleplex-android-review.googlesource.com/21693196', 'googleplex-android-review.googlesource.com/22078385'] into sparse-9719927-L98000000959299536.
...
SPARSE_CHANGE: If9eba1862e49fe31462b8f114b459c21e95d4549
SPARSE_CHANGE: I28a7b0dde48c391e6502ddf9877a7a1e66b7dc7a
Change-Id: I0cea8c12d9f6903e82d2322a05a878d12c198196
2023-03-22 04:10:33 +00:00
Steve Berbary
780232b30f
Update bluejay SVN to 31
...
Bug: 272844037
Change-Id: I28a7b0dde48c391e6502ddf9877a7a1e66b7dc7a
(cherry picked from commit on googleplex-android-review.googlesource.com host: de230640ea
)
Merged-In: I28a7b0dde48c391e6502ddf9877a7a1e66b7dc7a
2023-03-22 04:08:14 +00:00
Steve Berbary
ae5b077989
Update bluejay SVN to 30
...
Bug: 268558932
Change-Id: If9eba1862e49fe31462b8f114b459c21e95d4549
(cherry picked from commit on googleplex-android-review.googlesource.com host: e5ddd8edf2
)
Merged-In: If9eba1862e49fe31462b8f114b459c21e95d4549
2023-03-22 04:08:08 +00:00
Android Build Coastguard Worker
279ea021ee
[coastguard skipped] Merge sparse cherrypicks from sparse-9719927-L02000000959258504 into tm-qpr2-release.
...
COASTGUARD_SKIP: I28a7b0dde48c391e6502ddf9877a7a1e66b7dc7a
COASTGUARD_SKIP: I0616ce4a686a482c83e202374efbf3851047d1b8
COASTGUARD_SKIP: If9eba1862e49fe31462b8f114b459c21e95d4549
Change-Id: If7da9f5522ae56dd5222a6bca8058f90c90965c0
2023-03-21 03:54:23 +00:00
Android Build Coastguard Worker
c224212b4c
Merge cherrypicks of ['googleplex-android-review.googlesource.com/21693196', 'googleplex-android-review.googlesource.com/22078385'] into sparse-9719927-L02000000959258504.
...
SPARSE_CHANGE: If9eba1862e49fe31462b8f114b459c21e95d4549
SPARSE_CHANGE: I28a7b0dde48c391e6502ddf9877a7a1e66b7dc7a
Change-Id: I0616ce4a686a482c83e202374efbf3851047d1b8
2023-03-21 03:47:46 +00:00
Steve Berbary
da388886a8
Update bluejay SVN to 31
...
Bug: 272844037
Change-Id: I28a7b0dde48c391e6502ddf9877a7a1e66b7dc7a
(cherry picked from commit on googleplex-android-review.googlesource.com host: de230640ea
)
Merged-In: I28a7b0dde48c391e6502ddf9877a7a1e66b7dc7a
2023-03-21 03:46:27 +00:00
Steve Berbary
e7f3f7017e
Update bluejay SVN to 30
...
Bug: 268558932
Change-Id: If9eba1862e49fe31462b8f114b459c21e95d4549
(cherry picked from commit on googleplex-android-review.googlesource.com host: e5ddd8edf2
)
Merged-In: If9eba1862e49fe31462b8f114b459c21e95d4549
2023-03-21 03:46:24 +00:00
Android Build Coastguard Worker
33c08f780f
Snap for 9754537 from 5b4000dc60
to udc-release
...
Change-Id: Ia79f4602317d896da886ca3ca9a3e910cb9b6d86
2023-03-16 03:01:51 +00:00
Android Build Coastguard Worker
149cfec77d
Snap for 9752887 from 9a862afe32
to tm-qpr3-release
...
Change-Id: I1503df8370970e0fbe53dff27da1db211ce3281b
2023-03-15 23:01:39 +00:00
Steve Berbary
7ab528f69c
Update bluejay SVN to 32 am: 9a862afe32
am: ea6b93a09e
am: 5b4000dc60
am: 2c65d83d7d
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/22088023
Change-Id: I5c3e38d9f7923298b7581105d9c1e9cbf92d8b0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15 08:53:34 +00:00
Steve Berbary
e8b62bd909
Update bluejay SVN to 32 am: 9a862afe32
am: ea6b93a09e
am: 5b4000dc60
am: 2bd82fe257
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/22088023
Change-Id: I742c3300a8679a6e082901b3eb94cf6a2feeb582
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15 08:51:58 +00:00
Steve Berbary
2c65d83d7d
Update bluejay SVN to 32 am: 9a862afe32
am: ea6b93a09e
am: 5b4000dc60
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/22088023
Change-Id: I82a021fc61aaeb430d0902c3019f75c6e7fad06d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15 08:18:06 +00:00
Steve Berbary
2bd82fe257
Update bluejay SVN to 32 am: 9a862afe32
am: ea6b93a09e
am: 5b4000dc60
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/22088023
Change-Id: I716caf0e4ef106d75e6a59eae530a1597c3e0cd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15 08:18:03 +00:00
Steve Berbary
5b4000dc60
Update bluejay SVN to 32 am: 9a862afe32
am: ea6b93a09e
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/22088023
Change-Id: I227895e754d1b285cd531e9c56a244325fcb6e1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15 07:39:50 +00:00
Steve Berbary
ea6b93a09e
Update bluejay SVN to 32 am: 9a862afe32
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/22088023
Change-Id: I8a9916a4e9f0021ee583ef15ea1086aaed5a9719
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15 07:03:27 +00:00
Steve Berbary
9a862afe32
Update bluejay SVN to 32
...
Bug: 272844037
Change-Id: Id5aa5823a335291fba6da3ffcb481b841ef459a7
2023-03-15 02:18:02 +00:00
Automerger Merge Worker
1eefeeb8fe
Merge "[automerger skipped] Merge Android 13 QPR2 am: 69ed58ce78
-s ours am: 95e5714088
-s ours am: 942685b157
-s ours am: fa51f861f0
-s ours am: 411e3fd108
-s ours"
2023-03-15 02:16:05 +00:00
Xin Li
019c1c7404
[automerger skipped] Merge Android 13 QPR2 am: 69ed58ce78
-s ours am: 95e5714088
-s ours am: 942685b157
-s ours am: fa51f861f0
-s ours am: 411e3fd108
-s ours
...
am skip reason: Merged-In Ic83c61df6297696c06e63a23241b308f92ac70bd with SHA-1 588ebb3a8f
is already in history
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2486736
Change-Id: I98f81059ff52b0a267cea67c99cc6404ea6593e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15 02:04:03 +00:00
Xin Li
073b234c19
[automerger skipped] Merge Android 13 QPR2 am: 69ed58ce78
-s ours am: 95e5714088
-s ours am: 942685b157
-s ours am: fa51f861f0
-s ours am: 3036eedd55
-s ours
...
am skip reason: Merged-In Ic83c61df6297696c06e63a23241b308f92ac70bd with SHA-1 588ebb3a8f
is already in history
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2486736
Change-Id: I85146f7bf13b7d03fe2de0d9ad090964277d57ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15 02:03:45 +00:00
Xin Li
411e3fd108
[automerger skipped] Merge Android 13 QPR2 am: 69ed58ce78
-s ours am: 95e5714088
-s ours am: 942685b157
-s ours am: fa51f861f0
-s ours
...
am skip reason: Merged-In Ic83c61df6297696c06e63a23241b308f92ac70bd with SHA-1 588ebb3a8f
is already in history
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2486736
Change-Id: I0fe271e37c4a6d59f5a97eeee7f5ac29779b7b94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15 01:10:48 +00:00
Xin Li
3036eedd55
[automerger skipped] Merge Android 13 QPR2 am: 69ed58ce78
-s ours am: 95e5714088
-s ours am: 942685b157
-s ours am: fa51f861f0
-s ours
...
am skip reason: Merged-In Ic83c61df6297696c06e63a23241b308f92ac70bd with SHA-1 588ebb3a8f
is already in history
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2486736
Change-Id: If56b6c34c9d0fead86966f654ec05b6386f397c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15 01:07:20 +00:00
Steve Berbary
d2f6a0032c
Update bluejay SVN to 31 am: de230640ea
am: 987ededda9
am: 32dc0da8fe
am: e2685bce58
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/22078385
Change-Id: If4a3eda23f02705762f6847dde95844fc0c0adc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15 00:23:28 +00:00
Steve Berbary
ece20aeab8
Update bluejay SVN to 31 am: de230640ea
am: 987ededda9
am: 32dc0da8fe
am: 633a6c9355
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/22078385
Change-Id: I0b3aec3cf5f9672a8d2c471d16ab31804d4460e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15 00:22:57 +00:00
Xin Li
fa51f861f0
[automerger skipped] Merge Android 13 QPR2 am: 69ed58ce78
-s ours am: 95e5714088
-s ours am: 942685b157
-s ours
...
am skip reason: Merged-In Ic83c61df6297696c06e63a23241b308f92ac70bd with SHA-1 588ebb3a8f
is already in history
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2486736
Change-Id: Id010420fb540974fcaa66796ecff2407b127c73f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15 00:06:18 +00:00
Steve Berbary
e2685bce58
Update bluejay SVN to 31 am: de230640ea
am: 987ededda9
am: 32dc0da8fe
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/22078385
Change-Id: If92faaa8478acd0de78a2fc404e1cd2c0664eaf1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 23:40:46 +00:00
Steve Berbary
633a6c9355
Update bluejay SVN to 31 am: de230640ea
am: 987ededda9
am: 32dc0da8fe
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/22078385
Change-Id: I07265ecece802f1e8965c82bc6f28254b39519b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 23:39:30 +00:00
Xin Li
942685b157
[automerger skipped] Merge Android 13 QPR2 am: 69ed58ce78
-s ours am: 95e5714088
-s ours
...
am skip reason: Merged-In Ic83c61df6297696c06e63a23241b308f92ac70bd with SHA-1 588ebb3a8f
is already in history
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2486736
Change-Id: Iba8c895f0cb45b4b3141bbd7c6601bdc9070f8a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 23:06:12 +00:00
Steve Berbary
32dc0da8fe
Update bluejay SVN to 31 am: de230640ea
am: 987ededda9
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/22078385
Change-Id: I89754947c5227298c7a8021b5577aa21cca65270
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 23:02:04 +00:00
Xin Li
95e5714088
[automerger skipped] Merge Android 13 QPR2 am: 69ed58ce78
-s ours
...
am skip reason: Merged-In Ic83c61df6297696c06e63a23241b308f92ac70bd with SHA-1 588ebb3a8f
is already in history
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2486736
Change-Id: Ie9a3fbd6589d2bc1d3fa5da7ebfb10404b8c5b99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 22:32:19 +00:00
Steve Berbary
987ededda9
Update bluejay SVN to 31 am: de230640ea
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/22078385
Change-Id: Id2426491851902500be621b4b229fd133c49ceb9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 21:41:38 +00:00
Steve Berbary
de230640ea
Update bluejay SVN to 31
...
Bug: 272844037
Change-Id: I28a7b0dde48c391e6502ddf9877a7a1e66b7dc7a
2023-03-14 20:15:44 +00:00
Xin Li
69ed58ce78
Merge Android 13 QPR2
...
Bug: 273316506
Merged-In: Ic83c61df6297696c06e63a23241b308f92ac70bd
Change-Id: Ida9fbc6ddbc729103197f8f352c5251acaaeac3f
2023-03-13 23:09:07 -07:00
Android Build Coastguard Worker
276b09eb04
Snap for 9735252 from b8a9fbf2db
to udc-release
...
Change-Id: Ide83b658ee684516ee5eeab0b6305259e7d64bcf
2023-03-14 01:27:53 +00:00