summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2020-04-29 00:20:26 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2020-04-29 00:20:26 +0000
commita1f9485de263c6ec22274b56c2148a5404b18044 (patch)
treea3c23570d6c6e27eabab17c2ca0e53a4e22292a9
parent2b89828ec90edf4701f9d17c0c4252c0c904c367 (diff)
parenta2b672ccd87a1baba5e9d7e5f9d59de8dd12919b (diff)
Merge "Enable edge gesture if quickstep has never started" into rvc-dev
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/phone/EdgeBackGestureHandler.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/EdgeBackGestureHandler.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/EdgeBackGestureHandler.java
index f9119c7a010f..ba8a63428cf6 100644
--- 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