Merge "Bugfix : Quick pulldown sometimes flips when it should not" into cm-10.1 (29fdb24c) · Commits · e / os / android_frameworks_base

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

+6 −1

Original line number	Diff line number	Diff line
		@@ -180,9 +180,14 @@ public class NotificationPanelView extends PanelView {
		if (maxy - miny < mHandleBarHeight) {
		if (getMeasuredHeight() < mHandleBarHeight) {
		mStatusBar.switchToSettings();
		} else {
		// Do not flip if the drag event started within the top bar
		if (MotionEvent.ACTION_DOWN == event.getActionMasked() && event.getY(0) < mHandleBarHeight ) {
		mStatusBar.switchToSettings();
		} else {
		mStatusBar.flipToSettings();
		}
		}
		mOkToFlip = false;
		}
		} else if (mSwipeTriggered) {