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

Commit 95d23f9a authored by Zak Cohen's avatar Zak Cohen
Browse files

Revert "Fix some touch issues during gesture nav transition" 

This reverts commit 1351c221.

Reason for revert: Suspect causing test failures: https://b.corp.google.com/issues/191946109

Change-Id: Ib1b5545b3a612e89923ea06a890e4a07be9fa857
parent 1351c221

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

+2 −5
Original line number Original line 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.

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

    private AnimatorControllerWithResistance mLauncherTransitionController;

    private AnimatorControllerWithResistance mLauncherTransitionController;

    private boolean mHasEndedLauncherTransition;





    private AnimationFactory mAnimationFactory = (t) -> { };

    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

     * 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.

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

     */

     */

    private boolean canCreateNewOrUpdateExistingLauncherTransitionController() {

    private boolean canCreateNewOrUpdateExistingLauncherTransitionController() {

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

        return mGestureState.getEndTarget() != HOME;

    }

    }





    @Override

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

    }





    private void endLauncherTransitionController() {

    private void endLauncherTransitionController() {

        mHasEndedLauncherTransition = true;



        if (mLauncherTransitionController != null) {

        if (mLauncherTransitionController != null) {

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

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

            mLauncherTransitionController.getNormalController().dispatchSetInterpolator(

            mLauncherTransitionController.getNormalController().dispatchSetInterpolator(

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

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




    private void updateOrientationHandler() {

    private void updateOrientationHandler() {

        // Handle orientation changes.

        // Handle orientation changes.

        PagedOrientationHandler oldOrientationHandler = mOrientationHandler;

        mOrientationHandler = mOrientationState.getOrientationHandler();

        mOrientationHandler = mOrientationState.getOrientationHandler();



        mIsRtl = mOrientationHandler.getRecentsRtlSetting(getResources());

        mIsRtl = mOrientationHandler.getRecentsRtlSetting(getResources());

        setLayoutDirection(mIsRtl

        setLayoutDirection(mIsRtl

                ? View.LAYOUT_DIRECTION_RTL

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

                ? View.LAYOUT_DIRECTION_LTR

                : View.LAYOUT_DIRECTION_RTL);

                : View.LAYOUT_DIRECTION_RTL);

        mClearAllButton.setRotation(mOrientationHandler.getDegreesRotated());

        mClearAllButton.setRotation(mOrientationHandler.getDegreesRotated());



        if (!mOrientationHandler.equals(oldOrientationHandler)) {

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

        mActivity.getDragLayer().recreateControllers();

        mActivity.getDragLayer().recreateControllers();

        }



        boolean isInLandscape = mOrientationState.getTouchRotation() != ROTATION_0

        boolean isInLandscape = mOrientationState.getTouchRotation() != ROTATION_0

                || mOrientationState.getRecentsActivityRotation() != ROTATION_0;

                || mOrientationState.getRecentsActivityRotation() != ROTATION_0;

        mActionsView.updateHiddenFlags(HIDDEN_NON_ZERO_ROTATION,

        mActionsView.updateHiddenFlags(HIDDEN_NON_ZERO_ROTATION,