Commit Graph

763033 Commits

Author SHA1 Message Date
Yurii Zubrytskyi
da5546321e [automerger skipped] Merge "frameworks/base - Tiramisu is now 33 #4" into tm-dev am: 029b86ef00 am: 6b3b2ebcce am: d648d1e70d -s ours
am skip reason: Merged-In Ifcc86b065ce770561a391a84d8bb81c2b72307cd with SHA-1 5b3038ea7e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17778829

Change-Id: I3d4079dc83d77307809b03e176ab6b2ad5bbeadd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 19:36:16 +00:00
Yurii Zubrytskyi
952d08c71d [automerger skipped] Merge "frameworks/base - Tiramisu is now 33 #4" into tm-dev am: 029b86ef00 am: ccdfba4570 am: 1e9985f845 -s ours
am skip reason: Merged-In Ifcc86b065ce770561a391a84d8bb81c2b72307cd with SHA-1 5b3038ea7e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17778829

Change-Id: Ieba0b5ec986c15b8068cbcb8a5467798e5bc97a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 19:31:35 +00:00
TreeHugger Robot
17caec71dd Merge "Add TEST_MAPPING for com.android.server.display" into tm-dev am: 3ce32193f0 am: 01418e6cc8 am: b90187d244
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17915194

Change-Id: I2efbdd36f5b56974f6061aa6585082f5cf222a5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 19:29:27 +00:00
Lucas Dupin
5a6d029bfc Merge "Fix scrims not fading in" into tm-dev am: 41e1c4680c am: 8eeb393073 am: 543a3de9ab
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17976322

Change-Id: I9fd036e53b5a3b4d554a44518b67e231dce7d9fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 19:29:15 +00:00
TreeHugger Robot
71f1f1e411 Merge "Don't update brightness settings when throttling brightness" into tm-dev am: c37d317e0c am: 40622ad72d am: f75ff64db1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17976323

Change-Id: I2782c6732785ee68f7d5edcefd950d045e6a8c1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 19:28:57 +00:00
Yurii Zubrytskyi
0544f6369f Merge "frameworks/base - Tiramisu is now 33 #4" into tm-dev am: 029b86ef00 am: 6b3b2ebcce am: 8ea36089c6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17778829

Change-Id: Ica9428619053fb3538e06b7cf68fe5085cdad95a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 19:27:36 +00:00
TreeHugger Robot
b90187d244 Merge "Add TEST_MAPPING for com.android.server.display" into tm-dev am: 3ce32193f0 am: 01418e6cc8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17915194

Change-Id: I1e28fa160011009f59946d7ef7dad08e545b2df4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 19:21:23 +00:00
Lucas Dupin
543a3de9ab Merge "Fix scrims not fading in" into tm-dev am: 41e1c4680c am: 8eeb393073
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17976322

Change-Id: I507087fcc0b98844d192247a06b994e75119e3f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 19:21:17 +00:00
TreeHugger Robot
f75ff64db1 Merge "Don't update brightness settings when throttling brightness" into tm-dev am: c37d317e0c am: 40622ad72d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17976323

Change-Id: I03ed17ac201bb57d5c1e121165083a40ebfad18d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 19:20:23 +00:00
TreeHugger Robot
01418e6cc8 Merge "Add TEST_MAPPING for com.android.server.display" into tm-dev am: 3ce32193f0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17915194

Change-Id: Ic66050312cc2a61509e8e7f3e1cc24463b5fb596
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 19:13:02 +00:00
Lucas Dupin
8eeb393073 Merge "Fix scrims not fading in" into tm-dev am: 41e1c4680c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17976322

Change-Id: I4ce7f75fbdfbb5189e40be9243080c307a21449f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 19:12:42 +00:00
Joe Bolinger
1ec3df7d32 Merge "Always play haptic on UDFPS reject." into tm-d1-dev am: fb18e86f59 am: e5c15102f1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17946388

Change-Id: I48c4d338528a01e956c8fc9204276353b2d08054
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 19:12:31 +00:00
TreeHugger Robot
40622ad72d Merge "Don't update brightness settings when throttling brightness" into tm-dev am: c37d317e0c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17976323

Change-Id: Ifd06ae2a66142d83c0610b3918f52c0a8bbbba0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 19:12:25 +00:00
Yurii Zubrytskyi
d648d1e70d Merge "frameworks/base - Tiramisu is now 33 #4" into tm-dev am: 029b86ef00 am: 6b3b2ebcce
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17778829

Change-Id: Ie1182f84f3af576e2b7a41ac33830807df962517
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 19:10:52 +00:00
Tyler Lacey
326484ecb9 Merge "Use Window Context for SurfaceControlViewHost." into tm-dev am: c85e97a7a1 am: b89785bb2f am: 5f2be4b900
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17619324

Change-Id: I1488c353d542e02c9c01c93a59a5946e926068c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 19:10:50 +00:00
Yurii Zubrytskyi
1e9985f845 Merge "frameworks/base - Tiramisu is now 33 #4" into tm-dev am: 029b86ef00 am: ccdfba4570
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17778829

Change-Id: I077c1fde67a7507506b9cf6e763360af94705ebb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 19:10:28 +00:00
Lyn Han
a3dc7faf64 Merge "Fix stack height jump during lockscreen=>shade and aod<=>ls" into tm-dev am: c5b165e8a5 am: 726f5f323a am: 7097029e74
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17872584

Change-Id: I1a9cba04ddda05ff992a69d7b0d3045036521679
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 19:10:03 +00:00
Yurii Zubrytskyi
8ea36089c6 Merge "frameworks/base - Tiramisu is now 33 #4" into tm-dev am: 029b86ef00 am: 6b3b2ebcce
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17778829

Change-Id: I7e0c35149c6cf8d26cee0ff91f75fd377a30f4b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 19:09:10 +00:00
Joe Bolinger
e5befe9df9 Merge "Always play haptic on UDFPS reject." into tm-d1-dev am: fb18e86f59 am: 2971830381
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17946388

Change-Id: I5ed07306d437c39389dc33fede970f09976ce3f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 19:05:32 +00:00
Tyler Lacey
02f35335aa Merge "Use Window Context for SurfaceControlViewHost." into tm-dev am: c85e97a7a1 am: b89785bb2f am: 9b1000bd15
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17619324

Change-Id: I73b6e2b1bd2c4c718abeebfbcce2e5f4fd156ee6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 19:03:42 +00:00
Lyn Han
481bb0ec85 Merge "Fix stack height jump during lockscreen=>shade and aod<=>ls" into tm-dev am: c5b165e8a5 am: 726f5f323a am: 81ed4c86d7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17872584

Change-Id: Ic79b1f4a6c125a81898bdaa92258af00ad6245c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 19:00:58 +00:00
TreeHugger Robot
3ce32193f0 Merge "Add TEST_MAPPING for com.android.server.display" into tm-dev 2022-04-27 18:48:36 +00:00
Lucas Dupin
41e1c4680c Merge "Fix scrims not fading in" into tm-dev 2022-04-27 18:46:00 +00:00
Joe Bolinger
2971830381 Merge "Always play haptic on UDFPS reject." into tm-d1-dev am: fb18e86f59
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17946388

Change-Id: I02d03403a7846db22236069c278757f811b11f6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 18:30:01 +00:00
Tyler Lacey
9b1000bd15 Merge "Use Window Context for SurfaceControlViewHost." into tm-dev am: c85e97a7a1 am: b89785bb2f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17619324

Change-Id: I6d17f1728c1f96a67dd2933ddaae13f5407db2bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 18:29:51 +00:00
Joe Bolinger
e5c15102f1 Merge "Always play haptic on UDFPS reject." into tm-d1-dev am: fb18e86f59
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17946388

Change-Id: I89136f6e588569016875efe30d02686f246c5718
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 18:29:50 +00:00
Tyler Lacey
5f2be4b900 Merge "Use Window Context for SurfaceControlViewHost." into tm-dev am: c85e97a7a1 am: b89785bb2f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17619324

Change-Id: I9e6fa7d93eba29dc0fde25f38e59797c901fedc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 18:29:25 +00:00
Lyn Han
81ed4c86d7 Merge "Fix stack height jump during lockscreen=>shade and aod<=>ls" into tm-dev am: c5b165e8a5 am: 726f5f323a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17872584

Change-Id: I7991e75b60d63c599ca50a80f11c597ce513bb08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 18:29:25 +00:00
Lyn Han
7097029e74 Merge "Fix stack height jump during lockscreen=>shade and aod<=>ls" into tm-dev am: c5b165e8a5 am: 726f5f323a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17872584

Change-Id: Idcc0539bd7df894f3715f36dc6a2c8cb3a6d08da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 18:28:58 +00:00
Yurii Zubrytskyi
6b3b2ebcce Merge "frameworks/base - Tiramisu is now 33 #4" into tm-dev am: 029b86ef00
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17778829

Change-Id: I8419e479b9a7e9a6a56e166d04c88f1dcf7f0dff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 18:27:55 +00:00
Yurii Zubrytskyi
ccdfba4570 Merge "frameworks/base - Tiramisu is now 33 #4" into tm-dev am: 029b86ef00
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17778829

Change-Id: Iee05f72f02a1f74beb6ad6663f380121aba60923
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 18:27:04 +00:00
Joe Bolinger
fb18e86f59 Merge "Always play haptic on UDFPS reject." into tm-d1-dev 2022-04-27 18:27:00 +00:00
TreeHugger Robot
c37d317e0c Merge "Don't update brightness settings when throttling brightness" into tm-dev 2022-04-27 18:19:15 +00:00
Yurii Zubrytskyi
029b86ef00 Merge "frameworks/base - Tiramisu is now 33 #4" into tm-dev 2022-04-27 18:13:03 +00:00
Tyler Lacey
8b3dc9e5be Merge "Use Window Context for SurfaceControlViewHost." into tm-dev am: c85e97a7a1 am: 31b9087497 am: 92347363e8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17619324

Change-Id: I6d753ba357ae8596fb4b3fcc5a187e50bff44c8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 18:12:57 +00:00
Lyn Han
e31af8a87a Merge "Fix stack height jump during lockscreen=>shade and aod<=>ls" into tm-dev am: c5b165e8a5 am: 0dce6876b1 am: 83195912d8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17872584

Change-Id: I1e010a3c3093ad0ee54e6a9f358251ed5d3c2eed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 18:12:41 +00:00
Lucas Lin
9ba3068620 Merge changes I4bfaf79a,I8711187e am: 0a4fd7e9ea am: d592422bc7 am: 23e7c017a6 am: aec368effb
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2073067

Change-Id: I203fd106e008847198181b26e3ded38463454fbc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 18:12:16 +00:00
Ahaan Ugale
37c8290388 Merge "Allow IVoiceInteractionSessionListener to listen for window vis changes" into tm-dev am: 44e14e72b6 am: ce7618a36c am: e97987a209
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17211290

Change-Id: I8e3dd55e3f715c6437e54522ed27fed5d6ea063a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 18:11:40 +00:00
TreeHugger Robot
138ac27087 Merge "Fix notifications trimmed when unfolded on keyguard" into tm-dev am: e077c526d2 am: 03c8514788 am: 36dd4a698c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17693163

Change-Id: I7cabc31945fc2d21d29a94a3512b903a01072970
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 18:10:52 +00:00
Tyler Lacey
92347363e8 Merge "Use Window Context for SurfaceControlViewHost." into tm-dev am: c85e97a7a1 am: 31b9087497
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17619324

Change-Id: I69c95c069d637bc148fec8d73d49987a6594a664
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 18:06:34 +00:00
Lyn Han
83195912d8 Merge "Fix stack height jump during lockscreen=>shade and aod<=>ls" into tm-dev am: c5b165e8a5 am: 0dce6876b1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17872584

Change-Id: I3ec07c4906678703e665de37908915522672b0d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 18:06:02 +00:00
Lucas Lin
aec368effb Merge changes I4bfaf79a,I8711187e am: 0a4fd7e9ea am: d592422bc7 am: 23e7c017a6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2073067

Change-Id: Id8bb47aa2bc73fa6a26b09449de6bd0680327ea2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 18:05:19 +00:00
Ahaan Ugale
e97987a209 Merge "Allow IVoiceInteractionSessionListener to listen for window vis changes" into tm-dev am: 44e14e72b6 am: ce7618a36c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17211290

Change-Id: I5cb02e4ff77522d9d63f7245ab37c62e66668d13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 18:04:02 +00:00
TreeHugger Robot
36dd4a698c Merge "Fix notifications trimmed when unfolded on keyguard" into tm-dev am: e077c526d2 am: 03c8514788
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17693163

Change-Id: I565704b107b0a2e50560eec850aaf9f4ea6bcb07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 18:03:28 +00:00
Tyler Lacey
b89785bb2f Merge "Use Window Context for SurfaceControlViewHost." into tm-dev am: c85e97a7a1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17619324

Change-Id: I1cddafcef6a97b795ee0de64bdf2abf0ff02c80b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 18:03:24 +00:00
Lyn Han
726f5f323a Merge "Fix stack height jump during lockscreen=>shade and aod<=>ls" into tm-dev am: c5b165e8a5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17872584

Change-Id: I8bfeaa56b988567615eafcb8b8d912ae2e1c570f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 18:02:55 +00:00
Tyler Lacey
31b9087497 Merge "Use Window Context for SurfaceControlViewHost." into tm-dev am: c85e97a7a1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17619324

Change-Id: Id3ebbe7e485a3b5a6349916fc06bdde61d357958
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 18:01:35 +00:00
Lyn Han
0dce6876b1 Merge "Fix stack height jump during lockscreen=>shade and aod<=>ls" into tm-dev am: c5b165e8a5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17872584

Change-Id: Ib358baa5b732a02646b779e09c36dee9baa9275f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 18:01:18 +00:00
Ahaan Ugale
598357b2c1 Merge "Allow IVoiceInteractionSessionListener to listen for window vis changes" into tm-dev am: 44e14e72b6 am: ad3eae01cf am: 1553d721d9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17211290

Change-Id: Ic59d7a2353b0283464743d6a59338e1fb860a71c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 17:58:25 +00:00
TreeHugger Robot
0b017a3d24 Merge "Fix notifications trimmed when unfolded on keyguard" into tm-dev am: e077c526d2 am: adabb768cb am: ad30113d66
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17693163

Change-Id: I55160169d583ec18c606fe5af6ffa1ddabab962a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 17:57:51 +00:00