Merge "Enable edge gesture if quickstep has never started" into rvc-dev am: a1f9485de2 am: 03870a8de0

Change-Id: I56b5c438fb7f90b79d13f7440fc50f630546b6d5
2020-04-29 00:24:57 +00:00
parent 4238957bcc 03870a8de0
commit 2f1b0e2015
1 changed files with 2 additions and 1 deletions
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/EdgeBackGestureHandler.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/EdgeBackGestureHandler.java
@@ -556,7 +556,8 @@ public class EdgeBackGestureHandler extends CurrentUserTracker implements Displa

    private void updateDisabledForQuickstep() {
        int rotation = mContext.getResources().getConfiguration().windowConfiguration.getRotation();
-        mDisabledForQuickstep = mStartingQuickstepRotation != rotation;
+        mDisabledForQuickstep = mStartingQuickstepRotation > -1 &&
+                mStartingQuickstepRotation != rotation;
    }

    @Override