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

Commit 5af9c353 authored by Tony Wickham's avatar Tony Wickham
Browse files

Allow swipe up to go home from overivew during task dismiss animation 

Test: go to overview, dismiss a task, swipe up to go home during the
transition (easier to try with animation duraation scaled up)

Bug: 144170434
Change-Id: I28b846b43260179aeac877351a7069743f66f3ea
parent c5eedfb3

quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java

+10 −2
Original line number Diff line number Diff line
@@ -82,7 +82,15 @@ public abstract class TaskViewTouchController<T extends BaseDraggingActivity> 
        mDetector = new SingleAxisSwipeDetector(activity, this, dir);

    }



    private boolean canInterceptTouch() {

    private boolean canInterceptTouch(MotionEvent ev) {

        if ((ev.getEdgeFlags() & Utilities.EDGE_NAV_BAR) != 0) {

            // Don't intercept swipes on the nav bar, as user might be trying to go home

            // during a task dismiss animation.

            if (mCurrentAnimation != null) {

                mCurrentAnimation.getAnimationPlayer().end();

            }

            return false;

        }

        if (mCurrentAnimation != null) {

            mCurrentAnimation.forceFinishIfCloseToEnd();

        }
@@ -118,7 +126,7 @@ public abstract class TaskViewTouchController<T extends BaseDraggingActivity> 
            clearState();

        }

        if (ev.getAction() == MotionEvent.ACTION_DOWN) {

            mNoIntercept = !canInterceptTouch();

            mNoIntercept = !canInterceptTouch(ev);

            if (mNoIntercept) {

                return false;

            }