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

* commit '15962f1da5803523a51a9c3f29315d566c708f66':
  Make status bar expanding more tightly coupled to finger

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;