am 196edbc9: am cdbdbe3a: Merge "Make status bar expanding more tightly coupled to finger" into lmp-mr1-dev

* commit '196edbc9f650d1840116e625092b8e9f5727806f': Make status bar expanding more tightly coupled to finger
2014-10-31 00:16:29 +00:00
parent 0b2c319f4c 196edbc9f6
commit 15962f1da5
1 changed files with 1 additions and 1 deletions
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java
@@ -284,7 +284,7 @@ public abstract class PanelView extends FrameLayout {
                                || mInitialOffsetOnTouch == 0f)) {
                    mTouchSlopExceeded = true;
                    if (waitForTouchSlop && !mTracking) {
-                        if (!mJustPeeked) {
+                        if (!mJustPeeked && mInitialOffsetOnTouch != 0f) {
                            mInitialOffsetOnTouch = mExpandedHeight;
                            mInitialTouchX = x;
                            mInitialTouchY = y;