am 965bab2b: Merge "Allow assist gesture when notification shade is expanded" into mnc-dev

* commit '965bab2bae4198deaa929c8f36e44c561fb2c72c': Allow assist gesture when notification shade is expanded
2015-07-28 00:50:49 +00:00
parent 9659297d9c 965bab2bae
commit 7d07aff85e
1 changed files with 1 additions and 3 deletions
--- 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 class PhoneStatusBar extends BaseStatusBar implements DemoMode,

    @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) {