commit 3c8e0f44cbd81ca5b05c6100c0bac8c7444bf963
author Riddle Hsu <riddlehsu@google.com> Mon Feb 05 12:46:00 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Feb 05 12:46:00 2024 +0000
tree c3f5c23065bf8480bca4de6d3c6a7282b3220cc3
parent c80b0a81ff2a8217c089f13b4b6cac49c0659ca2
parent 0500ea706061492d81e5cd8dfbf1b09153cf7c8d

Merge "Run reveal animation from relative top of window" into main

libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/SplashScreenExitAnimationUtils.java

diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/SplashScreenExitAnimationUtils.java b/libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/SplashScreenExitAnimationUtils.java
index e86b62d..6325c68 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/SplashScreenExitAnimationUtils.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/SplashScreenExitAnimationUtils.java
@@ -390,7 +390,7 @@
                                 SurfaceControl firstWindowSurface, ViewGroup splashScreenView,
                                 TransactionPool transactionPool, Rect firstWindowFrame,
                                 int mainWindowShiftLength, float roundedCornerRadius) {
-            mFromYDelta = fromYDelta - roundedCornerRadius;
+            mFromYDelta = fromYDelta - Math.max(firstWindowFrame.top, roundedCornerRadius);
             mToYDelta = toYDelta;
             mOccludeHoleView = occludeHoleView;
             mApplier = new SyncRtSurfaceTransactionApplier(occludeHoleView);