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

* commit '7d07aff85e41a95ce4743d3b371935c9f21813ab':
  Allow assist gesture when notification shade is expanded
This commit is contained in:
Jorim Jaggi
2015-07-28 01:06:28 +00:00
committed by Android Git Automerger

View File

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