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

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

Browse Source 
* commit 'fdebf0fda9169b848c1e8eaafbcf3c720a0dabc6':
  You can only use the 2-finger shortcut when opening the panel.
This commit is contained in:
Daniel Sandler
2012-10-17 20:06:33 -07:00
committed by Android Git Automerger
parent 3786a9b97a fdebf0fda9
commit 9657c5e2cd
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;
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;