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

Change-Id: I3d3345bf7f998eb339c6d1648339544a15afec7e
2020-04-29 00:23:53 +00:00
parent ef36aa7e69 a1f9485de2
commit ac88990ef2
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