Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3ed72b4f authored by Jon Miranda's avatar Jon Miranda
Browse files

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
parent eeee84ef

quickstep/src/com/android/quickstep/inputconsumers/TaskbarStashInputConsumer.java

+4 −6
Original line number Diff line number Diff line
@@ -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);

                                }