From 3ed72b4f921a57050ffecc7696d8d424c97a9036 Mon Sep 17 00:00:00 2001 From: Jon Miranda Date: Mon, 6 Mar 2023 11:57:47 -0800 Subject: [PATCH] Use dY to determine if taskbar nav threshold is met. Prior to this change, we used absoulte screen values. With this change, the nav threshold is aligned with all other taskbar thresholds. Fixes: 269167210 Bug: 267646355 Test: swipe up to show taskbar Change-Id: Ie2017577fd640b4173fd5ba10122d6906e74f90a --- .../inputconsumers/TaskbarStashInputConsumer.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/quickstep/src/com/android/quickstep/inputconsumers/TaskbarStashInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/TaskbarStashInputConsumer.java index 1630d0f7e2..9982162368 100644 --- a/quickstep/src/com/android/quickstep/inputconsumers/TaskbarStashInputConsumer.java +++ b/quickstep/src/com/android/quickstep/inputconsumers/TaskbarStashInputConsumer.java @@ -52,7 +52,7 @@ public class TaskbarStashInputConsumer extends DelegateInputConsumer { private final float mUnstashArea; private final float mScreenWidth; - private final int mTaskbarNavThresholdY; + private final int mTaskbarNavThreshold; private final boolean mIsTaskbarAllAppsOpen; private boolean mHasPassedTaskbarNavThreshold; @@ -73,9 +73,7 @@ public class TaskbarStashInputConsumer extends DelegateInputConsumer { Resources res = context.getResources(); mUnstashArea = res.getDimensionPixelSize(R.dimen.taskbar_unstash_input_area); - int taskbarNavThreshold = res.getDimensionPixelSize(R.dimen.taskbar_nav_threshold); - int screenHeight = taskbarActivityContext.getDeviceProfile().heightPx; - mTaskbarNavThresholdY = screenHeight - taskbarNavThreshold; + mTaskbarNavThreshold = res.getDimensionPixelSize(R.dimen.taskbar_nav_threshold); mIsTaskbarAllAppsOpen = mTaskbarActivityContext != null && mTaskbarActivityContext.isTaskbarAllAppsOpen(); @@ -157,7 +155,7 @@ public class TaskbarStashInputConsumer extends DelegateInputConsumer { if (mIsTransientTaskbar) { float dY = mLastPos.y - mDownPos.y; boolean passedTaskbarNavThreshold = dY < 0 - && mLastPos.y < mTaskbarNavThresholdY; + && Math.abs(dY) >= mTaskbarNavThreshold; if (!mHasPassedTaskbarNavThreshold && passedTaskbarNavThreshold) { mHasPassedTaskbarNavThreshold = true; @@ -165,7 +163,7 @@ public class TaskbarStashInputConsumer extends DelegateInputConsumer { } if (dY < 0) { - dY = -OverScroll.dampedScroll(-dY, mTaskbarNavThresholdY); + dY = -OverScroll.dampedScroll(-dY, mTaskbarNavThreshold); if (mTransitionCallback != null && !mIsTaskbarAllAppsOpen) { mTransitionCallback.onActionMove(dY); }