summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEthan Chen <intervigil@gmail.com>2015-12-07 17:27:34 -0800
committerEthan Chen <intervigil@gmail.com>2015-12-08 11:18:49 -0800
commitd2bec52c76a3bb2c9a7fa3533e40f782fa592826 (patch)
tree0660d99761d04b7377ab17705bf70f1cffbcd445
parent477f58dc1413943926f2b4428f5873c0bb04dab8 (diff)
downloadframeworks_base-d2bec52c76a3bb2c9a7fa3533e40f782fa592826.zip
frameworks_base-d2bec52c76a3bb2c9a7fa3533e40f782fa592826.tar.gz
frameworks_base-d2bec52c76a3bb2c9a7fa3533e40f782fa592826.tar.bz2
SystemUI: Fix quick-quick settings pulldown settings
* Sliding from the right side of the statusbar to show quicksettings should respect the settings option. Fix it. Change-Id: Iaf5bf7a95bf6d63aaf88dccbfc2c6f988f49ec0d
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
index 95e533a..bcf1c2f 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
@@ -857,8 +857,8 @@ public class NotificationPanelView extends PanelView implements
final float x = event.getX();
float region = (w * (1.f/4.f)); // TODO overlay region fraction?
final boolean showQsOverride = mOneFingerQuickSettingsIntercept &&
- isLayoutRtl() ? (x < region) : (w - region < x)
- && mStatusBarState == StatusBarState.SHADE;
+ (isLayoutRtl() ? (x < region) : (w - region < x)
+ && mStatusBarState == StatusBarState.SHADE);
return twoFingerDrag || showQsOverride || stylusButtonClickDrag || mouseButtonClickDrag;
}