diff options
author | Daniel Sandler <dsandler@android.com> | 2012-10-17 15:39:28 -0400 |
---|---|---|
committer | Daniel Sandler <dsandler@android.com> | 2012-10-17 15:54:02 -0400 |
commit | 2017a056624e747ac91f8203728960a27da0b95a (patch) | |
tree | 2d8c475f46f791c145ad1f1dcc62a5d7bddc0fef /packages/SystemUI/src/com/android | |
parent | 26f544aef2b28412d4185b22e5c5660f4293f21b (diff) | |
download | frameworks_base-2017a056624e747ac91f8203728960a27da0b95a.zip frameworks_base-2017a056624e747ac91f8203728960a27da0b95a.tar.gz frameworks_base-2017a056624e747ac91f8203728960a27da0b95a.tar.bz2 |
You can only use the 2-finger shortcut when opening the panel.
Bug: 7348917
Change-Id: I585c57f5eede72801fe1547d774c75256a0824b0
Diffstat (limited to 'packages/SystemUI/src/com/android')
-rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java | 8 |
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; |