summaryrefslogtreecommitdiffstats
path: root/packages/SystemUI/src/com/android
diff options
context:
space:
mode:
Diffstat (limited to 'packages/SystemUI/src/com/android')
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java8
1 files changed, 4 insertions, 4 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 a857eba..248a516 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
@@ -35,7 +35,7 @@ public class NotificationPanelView extends PanelView {
View mHandleView;
int mFingers;
PhoneStatusBar mStatusBar;
- private boolean mFlipped;
+ boolean mOkToFlip;
public NotificationPanelView(Context context, AttributeSet attrs) {
super(context, attrs);
@@ -94,10 +94,10 @@ public class NotificationPanelView extends PanelView {
if (PhoneStatusBar.SETTINGS_DRAG_SHORTCUT && mStatusBar.mHasFlipSettings) {
switch (event.getActionMasked()) {
case MotionEvent.ACTION_DOWN:
- mFlipped = false;
+ mOkToFlip = getExpandedHeight() == 0;
break;
case MotionEvent.ACTION_POINTER_DOWN:
- if (!mFlipped) {
+ if (mOkToFlip) {
float miny = event.getY(0);
float maxy = miny;
for (int i=1; i<event.getPointerCount(); i++) {
@@ -111,7 +111,7 @@ public class NotificationPanelView extends PanelView {
} else {
mStatusBar.flipToSettings();
}
- mFlipped = true;
+ mOkToFlip = false;
}
}
break;