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

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

Refactor SwipeDetector to track both axes 

Existing clients now use the SingleAxisSwipeDetector subclass. A
followup CL will add BothAxesSwipeDetector, whose first client will be
the quick switch from home controller.

Bug: 126596417
Change-Id: I54c71088cfe99ff28cdc719a1eb7a7d06ac95d2d
parent f6d504d4

quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/FlingAndHoldTouchController.java

+2 −2
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ public class FlingAndHoldTouchController extends PortraitStatesTouchController { 
    }



    @Override

    public void onDragEnd(float velocity, boolean fling) {

    public void onDragEnd(float velocity) {

        if (mMotionPauseDetector.isPaused() && handlingOverviewAnim()) {

            if (mPeekAnim != null) {

                mPeekAnim.cancel();
@@ -196,7 +196,7 @@ public class FlingAndHoldTouchController extends PortraitStatesTouchController { 
            });

            overviewAnim.start();

        } else {

            super.onDragEnd(velocity, fling);

            super.onDragEnd(velocity);

        }



        View searchView = mLauncher.getAppsView().getSearchView();

quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java

+10 −6
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ import com.android.launcher3.anim.AnimatorPlaybackController; 
import com.android.launcher3.anim.AnimatorSetBuilder;

import com.android.launcher3.anim.Interpolators;

import com.android.launcher3.compat.AccessibilityManagerCompat;

import com.android.launcher3.touch.SwipeDetector;

import com.android.launcher3.touch.SingleAxisSwipeDetector;

import com.android.launcher3.userevent.nano.LauncherLogProto;

import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch;

import com.android.launcher3.util.TouchController;
@@ -52,12 +52,13 @@ import com.android.quickstep.views.RecentsView; 
/**

 * Handles swiping up on the nav bar to go home from launcher, e.g. overview or all apps.

 */

public class NavBarToHomeTouchController implements TouchController, SwipeDetector.Listener {

public class NavBarToHomeTouchController implements TouchController,

        SingleAxisSwipeDetector.Listener {



    private static final Interpolator PULLBACK_INTERPOLATOR = DEACCEL_3;



    private final Launcher mLauncher;

    private final SwipeDetector mSwipeDetector;

    private final SingleAxisSwipeDetector mSwipeDetector;

    private final float mPullbackDistance;



    private boolean mNoIntercept;
@@ -67,7 +68,8 @@ public class NavBarToHomeTouchController implements TouchController, SwipeDetect 


    public NavBarToHomeTouchController(Launcher launcher) {

        mLauncher = launcher;

        mSwipeDetector = new SwipeDetector(mLauncher, this, SwipeDetector.VERTICAL);

        mSwipeDetector = new SingleAxisSwipeDetector(mLauncher, this,

                SingleAxisSwipeDetector.VERTICAL);

        mPullbackDistance = mLauncher.getResources().getDimension(R.dimen.home_pullback_distance);

    }
@@ -79,7 +81,8 @@ public class NavBarToHomeTouchController implements TouchController, SwipeDetect 
            if (mNoIntercept) {

                return false;

            }

            mSwipeDetector.setDetectableScrollConditions(SwipeDetector.DIRECTION_POSITIVE, false);

            mSwipeDetector.setDetectableScrollConditions(SingleAxisSwipeDetector.DIRECTION_POSITIVE,

                    false /* ignoreSlop */);

        }



        if (mNoIntercept) {
@@ -173,7 +176,8 @@ public class NavBarToHomeTouchController implements TouchController, SwipeDetect 
    }



    @Override

    public void onDragEnd(float velocity, boolean fling) {

    public void onDragEnd(float velocity) {

        boolean fling = mSwipeDetector.isFling(velocity);

        final int logAction = fling ? Touch.FLING : Touch.SWIPE;

        float progress = mCurrentAnimation.getProgressFraction();

        float interpolatedProgress = PULLBACK_INTERPOLATOR.getInterpolation(progress);

quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/QuickSwitchTouchController.java

+3 −3
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ import com.android.launcher3.LauncherStateManager; 
import com.android.launcher3.Utilities;

import com.android.launcher3.anim.AnimatorSetBuilder;

import com.android.launcher3.touch.AbstractStateChangeTouchController;

import com.android.launcher3.touch.SwipeDetector;

import com.android.launcher3.touch.SingleAxisSwipeDetector;

import com.android.launcher3.userevent.nano.LauncherLogProto;

import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Direction;

import com.android.quickstep.SysUINavigationMode;
@@ -59,10 +59,10 @@ public class QuickSwitchTouchController extends AbstractStateChangeTouchControll 
    private @Nullable TaskView mTaskToLaunch;



    public QuickSwitchTouchController(Launcher launcher) {

        this(launcher, SwipeDetector.HORIZONTAL);

        this(launcher, SingleAxisSwipeDetector.HORIZONTAL);

    }



    protected QuickSwitchTouchController(Launcher l, SwipeDetector.Direction dir) {

    protected QuickSwitchTouchController(Launcher l, SingleAxisSwipeDetector.Direction dir) {

        super(l, dir);

    }

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

+17 −13
Original line number Diff line number Diff line
@@ -19,6 +19,9 @@ import static com.android.launcher3.AbstractFloatingView.TYPE_ACCESSIBLE; 
import static com.android.launcher3.anim.Interpolators.scrollInterpolatorForVelocity;

import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;

import static com.android.launcher3.config.FeatureFlags.QUICKSTEP_SPRINGS;

import static com.android.launcher3.touch.SingleAxisSwipeDetector.DIRECTION_BOTH;

import static com.android.launcher3.touch.SingleAxisSwipeDetector.DIRECTION_NEGATIVE;

import static com.android.launcher3.touch.SingleAxisSwipeDetector.DIRECTION_POSITIVE;

import static com.android.launcher3.util.DefaultDisplay.getSingleFrameMs;



import android.animation.Animator;
@@ -32,7 +35,8 @@ import com.android.launcher3.LauncherAnimUtils; 
import com.android.launcher3.Utilities;

import com.android.launcher3.anim.AnimatorPlaybackController;

import com.android.launcher3.anim.Interpolators;

import com.android.launcher3.touch.SwipeDetector;

import com.android.launcher3.touch.BaseSwipeDetector;

import com.android.launcher3.touch.SingleAxisSwipeDetector;

import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch;

import com.android.launcher3.util.FlingBlockCheck;

import com.android.launcher3.util.PendingAnimation;
@@ -46,15 +50,14 @@ import com.android.quickstep.views.TaskView; 
 * Touch controller for handling task view card swipes

 */

public abstract class TaskViewTouchController<T extends BaseDraggingActivity>

        extends AnimatorListenerAdapter implements TouchController, SwipeDetector.Listener {



    private static final String TAG = "OverviewSwipeController";

        extends AnimatorListenerAdapter implements TouchController,

        SingleAxisSwipeDetector.Listener {



    // Progress after which the transition is assumed to be a success in case user does not fling

    public static final float SUCCESS_TRANSITION_PROGRESS = 0.5f;



    protected final T mActivity;

    private final SwipeDetector mDetector;

    private final SingleAxisSwipeDetector mDetector;

    private final RecentsView mRecentsView;

    private final int[] mTempCords = new int[2];
@@ -74,7 +77,7 @@ public abstract class TaskViewTouchController<T extends BaseDraggingActivity> 
    public TaskViewTouchController(T activity) {

        mActivity = activity;

        mRecentsView = activity.getOverviewPanel();

        mDetector = new SwipeDetector(activity, this, SwipeDetector.VERTICAL);

        mDetector = new SingleAxisSwipeDetector(activity, this, SingleAxisSwipeDetector.VERTICAL);

    }



    private boolean canInterceptTouch() {
@@ -113,7 +116,7 @@ public abstract class TaskViewTouchController<T extends BaseDraggingActivity> 
            int directionsToDetectScroll = 0;

            boolean ignoreSlopWhenSettling = false;

            if (mCurrentAnimation != null) {

                directionsToDetectScroll = SwipeDetector.DIRECTION_BOTH;

                directionsToDetectScroll = DIRECTION_BOTH;

                ignoreSlopWhenSettling = true;

            } else {

                mTaskBeingDragged = null;
@@ -126,12 +129,12 @@ public abstract class TaskViewTouchController<T extends BaseDraggingActivity> 
                        if (!SysUINavigationMode.getMode(mActivity).hasGestures) {

                            // Don't allow swipe down to open if we don't support swipe up

                            // to enter overview.

                            directionsToDetectScroll = SwipeDetector.DIRECTION_POSITIVE;

                            directionsToDetectScroll = DIRECTION_POSITIVE;

                        } else {

                            // The task can be dragged up to dismiss it,

                            // and down to open if it's the current page.

                            directionsToDetectScroll = i == mRecentsView.getCurrentPage()

                                    ? SwipeDetector.DIRECTION_BOTH : SwipeDetector.DIRECTION_POSITIVE;

                                    ? DIRECTION_BOTH : DIRECTION_POSITIVE;

                        }

                        break;

                    }
@@ -165,8 +168,8 @@ public abstract class TaskViewTouchController<T extends BaseDraggingActivity> 
            return;

        }

        int scrollDirections = mDetector.getScrollDirections();

        if (goingUp && ((scrollDirections & SwipeDetector.DIRECTION_POSITIVE) == 0)

                || !goingUp && ((scrollDirections & SwipeDetector.DIRECTION_NEGATIVE) == 0)) {

        if (goingUp && ((scrollDirections & DIRECTION_POSITIVE) == 0)

                || !goingUp && ((scrollDirections & DIRECTION_NEGATIVE) == 0)) {

            // Trying to re-init in an unsupported direction.

            return;

        }
@@ -243,7 +246,8 @@ public abstract class TaskViewTouchController<T extends BaseDraggingActivity> 
    }



    @Override

    public void onDragEnd(float velocity, boolean fling) {

    public void onDragEnd(float velocity) {

        boolean fling = mDetector.isFling(velocity);

        final boolean goingToEnd;

        final int logAction;

        boolean blockedFling = fling && mFlingBlockCheck.isBlocked();
@@ -260,7 +264,7 @@ public abstract class TaskViewTouchController<T extends BaseDraggingActivity> 
            logAction = Touch.SWIPE;

            goingToEnd = interpolatedProgress > SUCCESS_TRANSITION_PROGRESS;

        }

        long animationDuration = SwipeDetector.calculateDuration(

        long animationDuration = BaseSwipeDetector.calculateDuration(

                velocity, goingToEnd ? (1 - progress) : progress);

        if (blockedFling && !goingToEnd) {

            animationDuration *= LauncherAnimUtils.blockedFlingDurationFactor(velocity);

quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/TransposedQuickSwitchTouchController.java

+2 −2
Original line number Diff line number Diff line
@@ -17,12 +17,12 @@ package com.android.launcher3.uioverrides.touchcontrollers; 


import com.android.launcher3.Launcher;

import com.android.launcher3.LauncherState;

import com.android.launcher3.touch.SwipeDetector;

import com.android.launcher3.touch.SingleAxisSwipeDetector;



public class TransposedQuickSwitchTouchController extends QuickSwitchTouchController {



    public TransposedQuickSwitchTouchController(Launcher launcher) {

        super(launcher, SwipeDetector.VERTICAL);

        super(launcher, SingleAxisSwipeDetector.VERTICAL);

    }



    @Override