commit 3cdbb9b03916e3a83ebf7f75b04792df558c916a
author Vinit Nayak <peanutbutter@google.com> Tue Jun 02 04:42:33 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jun 02 04:42:33 2020 +0000
tree 2cecf661142f928a51009ef23a521b039477a3f7
parent 210bb43493256642b5d5a454635dbc37465d5916
parent fb442a70f8d1bbaa54054023558892ef01aaf7a1

Merge "Set mLastRectRotation to valid rotation" into ub-launcher3-rvc-dev

quickstep/src/com/android/quickstep/OrientationTouchTransformer.java

diff --git a/quickstep/src/com/android/quickstep/OrientationTouchTransformer.java b/quickstep/src/com/android/quickstep/OrientationTouchTransformer.java
index d06393a..a976126 100644
--- a/quickstep/src/com/android/quickstep/OrientationTouchTransformer.java
+++ b/quickstep/src/com/android/quickstep/OrientationTouchTransformer.java
@@ -157,8 +157,9 @@
                 mMode != SysUINavigationMode.Mode.TWO_BUTTONS;
         if (mEnableMultipleRegions) {
             mQuickStepStartingRotation = info.rotation;
-        } else if (!enableMultipleRegions) {
-            mLastRectRotation = mQuickStepStartingRotation = QUICKSTEP_ROTATION_UNINITIALIZED;
+        } else {
+            mLastRectRotation = 0;
+            mQuickStepStartingRotation = QUICKSTEP_ROTATION_UNINITIALIZED;
         }
         resetSwipeRegions(info);
     }
@@ -293,6 +294,7 @@
                         mLastRectTouched = rect;
                         mLastRectRotation = rect.mRotation;
                         if (mEnableMultipleRegions && mCurrentDisplayRotation == mLastRectRotation) {
+                            // TODO(b/154580671) might make this block unnecessary
                             // Start a touch session for the default nav region for the display
                             mQuickStepStartingRotation = mLastRectTouched.mRotation;
                             resetSwipeRegions();