| commit | 93b6118b7e873ae428cc38e93b0a9bec128b764a | [log] [tgz] |
|---|---|---|
| author | Nick Chameyev <nickchameyev@google.com> | Mon Nov 21 12:03:49 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Nov 21 12:03:49 2022 +0000 |
| tree | bc9d95ed8781e34ea782a51e907d83e530d1d4a3 | |
| parent | dfeaf25769682d27eac3a89e84a9941b9ddacea1 [diff] | |
| parent | 050a0e5490098ac2d1205f690f38aa8200c837c6 [diff] |
Merge "[Unfold animation] Move the dark scrim below" into tm-qpr-dev am: bcfe2bfba0 am: 050a0e5490 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20519732 Change-Id: Iedb51e1df113423391b1053cd60d356c5ee9f334 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/packages/SystemUI/src/com/android/systemui/unfold/UnfoldLightRevealOverlayAnimation.kt b/packages/SystemUI/src/com/android/systemui/unfold/UnfoldLightRevealOverlayAnimation.kt index d411e34..ae30ca0 100644 --- a/packages/SystemUI/src/com/android/systemui/unfold/UnfoldLightRevealOverlayAnimation.kt +++ b/packages/SystemUI/src/com/android/systemui/unfold/UnfoldLightRevealOverlayAnimation.kt
@@ -94,7 +94,7 @@ overlayContainer = builder.build() SurfaceControl.Transaction() - .setLayer(overlayContainer, Integer.MAX_VALUE) + .setLayer(overlayContainer, UNFOLD_OVERLAY_LAYER_Z_INDEX) .show(overlayContainer) .apply() @@ -268,4 +268,12 @@ 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 + } }