summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Vinit Nayak <peanutbutter@google.com> 2022-11-18 18:43:06 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-11-18 18:43:06 +0000
commit1ca5302cad83d12b3f9589a4a48327a85b15206c (patch)
treea28d509e2dfc50c94f030fc6ff95f08e20e6c89d
parent25a8c14790669374f1b16894f43f7865949b4667 (diff)
parent2345ce432df0be03cfdce44f94d949329d496454 (diff)
Merge "Incremental update to portrait split gesture animation" into tm-qpr-dev am: 2345ce432d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20457062 Change-Id: I80e75499ff65d0c50826dd7733ad9a94e915df48 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--packages/SystemUI/shared/src/com/android/systemui/shared/recents/utilities/PreviewPositionHelper.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/recents/utilities/PreviewPositionHelper.java b/packages/SystemUI/shared/src/com/android/systemui/shared/recents/utilities/PreviewPositionHelper.java
index f45887cf7630..f6c75a2d2752 100644
--- a/packages/SystemUI/shared/src/com/android/systemui/shared/recents/utilities/PreviewPositionHelper.java
+++ b/packages/SystemUI/shared/src/com/android/systemui/shared/recents/utilities/PreviewPositionHelper.java
@@ -82,7 +82,8 @@ public class PreviewPositionHelper {
taskPercent = mDesiredStagePosition != STAGE_POSITION_TOP_OR_LEFT
? mSplitBounds.topTaskPercent
: (1 - (mSplitBounds.topTaskPercent + mSplitBounds.dividerHeightPercent));
- fullscreenTaskHeight = screenHeightPx * taskPercent;
+ // Scale portrait height to that of (actual screen - taskbar inset)
+ fullscreenTaskHeight = (screenHeightPx - taskbarSize) * taskPercent;
canvasScreenRatio = canvasHeight / fullscreenTaskHeight;
} else {
// For landscape, scale the width