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

Commit 05f08214 authored by Jon Miranda's avatar Jon Miranda Committed by Android (Google) Code Review
Browse files

Merge "Use dY to determine if taskbar nav threshold is met." into tm-qpr-dev

parents 9de1c05c 3ed72b4f

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

+4 −6
Original line number Original line Diff line number Diff line
@@ -52,7 +52,7 @@ public class TaskbarStashInputConsumer extends DelegateInputConsumer { 
    private final float mUnstashArea;

    private final float mUnstashArea;

    private final float mScreenWidth;

    private final float mScreenWidth;





    private final int mTaskbarNavThresholdY;

    private final int mTaskbarNavThreshold;

    private final boolean mIsTaskbarAllAppsOpen;

    private final boolean mIsTaskbarAllAppsOpen;

    private boolean mHasPassedTaskbarNavThreshold;

    private boolean mHasPassedTaskbarNavThreshold;
@@ -73,9 +73,7 @@ public class TaskbarStashInputConsumer extends DelegateInputConsumer { 




        Resources res = context.getResources();

        Resources res = context.getResources();

        mUnstashArea = res.getDimensionPixelSize(R.dimen.taskbar_unstash_input_area);

        mUnstashArea = res.getDimensionPixelSize(R.dimen.taskbar_unstash_input_area);

        int taskbarNavThreshold = res.getDimensionPixelSize(R.dimen.taskbar_nav_threshold);

        mTaskbarNavThreshold = res.getDimensionPixelSize(R.dimen.taskbar_nav_threshold);

        int screenHeight = taskbarActivityContext.getDeviceProfile().heightPx;

        mTaskbarNavThresholdY = screenHeight - taskbarNavThreshold;

        mIsTaskbarAllAppsOpen =

        mIsTaskbarAllAppsOpen =

                mTaskbarActivityContext != null && mTaskbarActivityContext.isTaskbarAllAppsOpen();

                mTaskbarActivityContext != null && mTaskbarActivityContext.isTaskbarAllAppsOpen();
@@ -157,7 +155,7 @@ public class TaskbarStashInputConsumer extends DelegateInputConsumer { 
                        if (mIsTransientTaskbar) {

                        if (mIsTransientTaskbar) {

                            float dY = mLastPos.y - mDownPos.y;

                            float dY = mLastPos.y - mDownPos.y;

                            boolean passedTaskbarNavThreshold = dY < 0

                            boolean passedTaskbarNavThreshold = dY < 0

                                    && mLastPos.y < mTaskbarNavThresholdY;

                                    && Math.abs(dY) >= mTaskbarNavThreshold;





                            if (!mHasPassedTaskbarNavThreshold && passedTaskbarNavThreshold) {

                            if (!mHasPassedTaskbarNavThreshold && passedTaskbarNavThreshold) {

                                mHasPassedTaskbarNavThreshold = true;

                                mHasPassedTaskbarNavThreshold = true;
@@ -165,7 +163,7 @@ public class TaskbarStashInputConsumer extends DelegateInputConsumer { 
                            }

                            }





                            if (dY < 0) {

                            if (dY < 0) {

                                dY = -OverScroll.dampedScroll(-dY, mTaskbarNavThresholdY);

                                dY = -OverScroll.dampedScroll(-dY, mTaskbarNavThreshold);

                                if (mTransitionCallback != null && !mIsTaskbarAllAppsOpen) {

                                if (mTransitionCallback != null && !mIsTaskbarAllAppsOpen) {

                                    mTransitionCallback.onActionMove(dY);

                                    mTransitionCallback.onActionMove(dY);

                                }

                                }