PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use dY to determine if taskbar nav threshold is met." into tm-qpr-dev am: 05f08214be am: 89d42acf47

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21802101

Change-Id: Iab0604593e39ff62027f3811c5d81a1b776f7b77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jon Miranda
2023-03-07 21:30:36 +00:00
committed by Automerger Merge Worker
parent a679877d2c 89d42acf47
commit 783ecfe114
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/src/com/android/quickstep/inputconsumers/TaskbarStashInputConsumer.java
+4 -6
View File
@@ -53,7 +53,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;
@@ -74,9 +74,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();
@@ -159,7 +157,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;
@@ -167,7 +165,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);
}