diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2015-07-28 00:36:14 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-28 00:36:14 +0000 |
| commit | 965bab2bae4198deaa929c8f36e44c561fb2c72c (patch) | |
| tree | 4a68de0c4489e234cc4c5c1608f3e8e101318ac3 /packages | |
| parent | beb6e66817e084c8a1ac92ecaeb6f0c73d11cc49 (diff) | |
| parent | 18976a51955c897f402b86bd00111a9fc5e958cb (diff) | |
| download | frameworks_base-965bab2bae4198deaa929c8f36e44c561fb2c72c.zip frameworks_base-965bab2bae4198deaa929c8f36e44c561fb2c72c.tar.gz frameworks_base-965bab2bae4198deaa929c8f36e44c561fb2c72c.tar.bz2 | |
Merge "Allow assist gesture when notification shade is expanded" into mnc-dev
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java index fb940d2..dfce170 100644 --- 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) { |