From f262cf989eb0913a7ba4ec713fc95fe5822fec8c Mon Sep 17 00:00:00 2001 From: Jon Miranda Date: Tue, 14 Mar 2023 11:04:16 -0700 Subject: [PATCH] Fix taskbar spring when going from home to overview. Bug: 246660243 Test: go home -> overview Change-Id: Id49d8f7457940ce28684c0259ed1f204b9026609 --- .../quickstep/inputconsumers/TaskbarStashInputConsumer.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/quickstep/src/com/android/quickstep/inputconsumers/TaskbarStashInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/TaskbarStashInputConsumer.java index 9982162368..1ddb855ef2 100644 --- a/quickstep/src/com/android/quickstep/inputconsumers/TaskbarStashInputConsumer.java +++ b/quickstep/src/com/android/quickstep/inputconsumers/TaskbarStashInputConsumer.java @@ -53,6 +53,7 @@ public class TaskbarStashInputConsumer extends DelegateInputConsumer { private final float mScreenWidth; private final int mTaskbarNavThreshold; + private final int mTaskbarNavThresholdY; private final boolean mIsTaskbarAllAppsOpen; private boolean mHasPassedTaskbarNavThreshold; @@ -74,6 +75,8 @@ public class TaskbarStashInputConsumer extends DelegateInputConsumer { Resources res = context.getResources(); mUnstashArea = res.getDimensionPixelSize(R.dimen.taskbar_unstash_input_area); mTaskbarNavThreshold = res.getDimensionPixelSize(R.dimen.taskbar_nav_threshold); + mTaskbarNavThresholdY = taskbarActivityContext.getDeviceProfile().heightPx + - mTaskbarNavThreshold; mIsTaskbarAllAppsOpen = mTaskbarActivityContext != null && mTaskbarActivityContext.isTaskbarAllAppsOpen(); @@ -163,7 +166,7 @@ public class TaskbarStashInputConsumer extends DelegateInputConsumer { } if (dY < 0) { - dY = -OverScroll.dampedScroll(-dY, mTaskbarNavThreshold); + dY = -OverScroll.dampedScroll(-dY, mTaskbarNavThresholdY); if (mTransitionCallback != null && !mIsTaskbarAllAppsOpen) { mTransitionCallback.onActionMove(dY); }