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

Commit 9f7eae75 authored by Tony Wickham's avatar Tony Wickham Committed by Automerger Merge Worker
Browse files

Merge "Fix some touch issues during gesture nav transition" into sc-dev am: 8db306f3 

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

Change-Id: I95ef73ae3b9352e70d16ff3a97ae74abf0b69656
parents bd80a07d 8db306f3

quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java

+5 −2
Original line number Diff line number Diff line
@@ -230,6 +230,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>, 


    // Used to control launcher components throughout the swipe gesture.

    private AnimatorControllerWithResistance mLauncherTransitionController;

    private boolean mHasEndedLauncherTransition;



    private AnimationFactory mAnimationFactory = (t) -> { };
@@ -603,11 +604,11 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>, 


    /**

     * We don't want to change mLauncherTransitionController if mGestureState.getEndTarget() == HOME

     * (it has its own animation).

     * (it has its own animation) or if we explicitly ended the controller already.

     * @return Whether we can create the launcher controller or update its progress.

     */

    private boolean canCreateNewOrUpdateExistingLauncherTransitionController() {

        return mGestureState.getEndTarget() != HOME;

        return mGestureState.getEndTarget() != HOME && !mHasEndedLauncherTransition;

    }



    @Override
@@ -1422,6 +1423,8 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>, 
    }



    private void endLauncherTransitionController() {

        mHasEndedLauncherTransition = true;



        if (mLauncherTransitionController != null) {

            // End the animation, but stay at the same visual progress.

            mLauncherTransitionController.getNormalController().dispatchSetInterpolator(

quickstep/src/com/android/quickstep/views/RecentsView.java

+8 −1
Original line number Diff line number Diff line
@@ -1265,7 +1265,9 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T 


    private void updateOrientationHandler() {

        // Handle orientation changes.

        PagedOrientationHandler oldOrientationHandler = mOrientationHandler;

        mOrientationHandler = mOrientationState.getOrientationHandler();



        mIsRtl = mOrientationHandler.getRecentsRtlSetting(getResources());

        setLayoutDirection(mIsRtl

                ? View.LAYOUT_DIRECTION_RTL
@@ -1274,7 +1276,12 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T 
                ? View.LAYOUT_DIRECTION_LTR

                : View.LAYOUT_DIRECTION_RTL);

        mClearAllButton.setRotation(mOrientationHandler.getDegreesRotated());



        if (!mOrientationHandler.equals(oldOrientationHandler)) {

            // Changed orientations, update controllers so they intercept accordingly.

            mActivity.getDragLayer().recreateControllers();

        }



        boolean isInLandscape = mOrientationState.getTouchRotation() != ROTATION_0

                || mOrientationState.getRecentsActivityRotation() != ROTATION_0;

        mActionsView.updateHiddenFlags(HIDDEN_NON_ZERO_ROTATION,