Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am c1dc37cb: Merge "You can only use the 2-finger shortcut when opening the panel." into jb-mr1-dev

Browse Source 
* commit 'c1dc37cba785d990cabfd4e27edadd18975f8751':
  You can only use the 2-finger shortcut when opening the panel.
This commit is contained in:
Daniel Sandler
2012-10-17 20:04:41 -07:00
committed by Android Git Automerger
parent 07a9ebd1a0 c1dc37cba7
commit fdebf0fda9
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
View File

@@ -35,7 +35,7 @@ public class NotificationPanelView extends PanelView {
View mHandleView; View mHandleView;
int mFingers; int mFingers;
PhoneStatusBar mStatusBar; PhoneStatusBar mStatusBar;
private boolean mFlipped; boolean mOkToFlip;
public NotificationPanelView(Context context, AttributeSet attrs) { public NotificationPanelView(Context context, AttributeSet attrs) {
super(context, attrs); super(context, attrs);
@@ -94,10 +94,10 @@ public class NotificationPanelView extends PanelView {
if (PhoneStatusBar.SETTINGS_DRAG_SHORTCUT && mStatusBar.mHasFlipSettings) { if (PhoneStatusBar.SETTINGS_DRAG_SHORTCUT && mStatusBar.mHasFlipSettings) {
switch (event.getActionMasked()) { switch (event.getActionMasked()) {
case MotionEvent.ACTION_DOWN: case MotionEvent.ACTION_DOWN:
mFlipped = false; mOkToFlip = getExpandedHeight() == 0;
break; break;
case MotionEvent.ACTION_POINTER_DOWN: case MotionEvent.ACTION_POINTER_DOWN:
if (!mFlipped) { if (mOkToFlip) {
float miny = event.getY(0); float miny = event.getY(0);
float maxy = miny; float maxy = miny;
for (int i=1; i<event.getPointerCount(); i++) { for (int i=1; i<event.getPointerCount(); i++) {
@@ -111,7 +111,7 @@ public class NotificationPanelView extends PanelView {
} else { } else {
mStatusBar.flipToSettings(); mStatusBar.flipToSettings();
} }
mFlipped = true; mOkToFlip = false;
} }
} }
break; break;