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

Commit 6a00bf85 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I5b2bb3dcb078d77bccaa1c328be81f5bfae7b565
parents 3e86b02d c48d4047

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

+2 −5
Original line number Diff line number Diff line
@@ -230,7 +230,6 @@ 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) -> { };
@@ -604,11 +603,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) or if we explicitly ended the controller already.

     * (it has its own animation).

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

     */

    private boolean canCreateNewOrUpdateExistingLauncherTransitionController() {

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

        return mGestureState.getEndTarget() != HOME;

    }



    @Override
@@ -1423,8 +1422,6 @@ 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

+1 −8
Original line number Diff line number Diff line
@@ -1265,9 +1265,7 @@ 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
@@ -1276,12 +1274,7 @@ 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,