summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Vinit Nayak <peanutbutter@google.com> 2022-11-18 19:18:30 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-11-18 19:18:30 +0000
commit1d4619ed77e35e1ad2889703c95f42270ffecda2 (patch)
tree3c9201c3c3a449f24d967dba97deadf02062f0e7
parent3fe124cd7f262b9de73e781e4e23a39725e97d86 (diff)
parent1ca5302cad83d12b3f9589a4a48327a85b15206c (diff)
Merge "Incremental update to portrait split gesture animation" into tm-qpr-dev am: 2345ce432d am: 1ca5302cad
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20457062 Change-Id: I20e55cfc8d59d7e7f0e2c7f8e6f4bd12bbb96d77 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