Merge "[Unfold animation] Move the dark scrim below" into tm-qpr-dev am: bcfe2bfba0

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

Change-Id: I59bf2746dd022ddd086cf72edeea7474e2055598
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Nick Chameyev
2022-11-21 11:32:03 +00:00
committed by Automerger Merge Worker

View File

@@ -94,7 +94,7 @@ constructor(
overlayContainer = builder.build() overlayContainer = builder.build()
SurfaceControl.Transaction() SurfaceControl.Transaction()
.setLayer(overlayContainer, Integer.MAX_VALUE) .setLayer(overlayContainer, UNFOLD_OVERLAY_LAYER_Z_INDEX)
.show(overlayContainer) .show(overlayContainer)
.apply() .apply()
@@ -268,4 +268,12 @@ constructor(
this.isFolded = isFolded this.isFolded = isFolded
} }
) )
private companion object {
private const val ROTATION_ANIMATION_OVERLAY_Z_INDEX = Integer.MAX_VALUE
// Put the unfold overlay below the rotation animation screenshot to hide the moment
// when it is rotated but the rotation of the other windows hasn't happen yet
private const val UNFOLD_OVERLAY_LAYER_Z_INDEX = ROTATION_ANIMATION_OVERLAY_Z_INDEX - 1
}
} }