From 95d23f9a4dda4a058f66d79a1f28cd28e8314440 Mon Sep 17 00:00:00 2001
From: Zak Cohen <zakcohen@google.com>
Date: Thu, 24 Jun 2021 18:11:36 +0000
Subject: [PATCH] Revert "Fix some touch issues during gesture nav transition"

This reverts commit 1351c2214d54d01ee457ee338d0559ef3796c083.

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

Change-Id: Ib1b5545b3a612e89923ea06a890e4a07be9fa857
---
 .../src/com/android/quickstep/AbsSwipeUpHandler.java     | 7 ++-----
 .../src/com/android/quickstep/views/RecentsView.java     | 9 +--------
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index d511e6da9f..4d47ef15c1 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -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
@@ -1422,8 +1421,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(
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 8a665251ff..2b256a43c6 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -1248,9 +1248,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
@@ -1259,12 +1257,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();
-        }
-
+        mActivity.getDragLayer().recreateControllers();
         boolean isInLandscape = mOrientationState.getTouchRotation() != ROTATION_0
                 || mOrientationState.getRecentsActivityRotation() != ROTATION_0;
         mActionsView.updateHiddenFlags(HIDDEN_NON_ZERO_ROTATION,