Merge "Allow assist gesture when notification shade is expanded" into mnc-dev

XSJoJo · Android (Google) Code Review · commit 965bab2bae41 · 2015-07-28T00:36:14.000Z
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
@@ -3163,9 +3163,7 @@ public void run() {
 
     @Override
     public boolean shouldDisableNavbarGestures() {
-        return !isDeviceProvisioned()
-                || mExpandedVisible
-                || (mDisabled1 & StatusBarManager.DISABLE_SEARCH) != 0;
+        return !isDeviceProvisioned() || (mDisabled1 & StatusBarManager.DISABLE_SEARCH) != 0;
     }
 
     public void postStartActivityDismissingKeyguard(final Intent intent, int delay) {

Original file line number	Diff line number	Diff line change
`@@ -3163,9 +3163,7 @@ public void run() {`
`3163`	`3163`
`3164`	`3164`	`@Override`
`3165`	`3165`	`public boolean shouldDisableNavbarGestures() {`
`3166`		`- return !isDeviceProvisioned()`
`3167`		`- \|\| mExpandedVisible`
`3168`		`- \|\| (mDisabled1 & StatusBarManager.DISABLE_SEARCH) != 0;`
	`3166`	`+ return !isDeviceProvisioned() \|\| (mDisabled1 & StatusBarManager.DISABLE_SEARCH) != 0;`
`3169`	`3167`	`}`
`3170`	`3168`
`3171`	`3169`	`public void postStartActivityDismissingKeyguard(final Intent intent, int delay) {`