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
This commit is contained in:
Jorim Jaggi
2014-10-31 00:16:29 +00:00
committed by Android Git Automerger

View File

@@ -284,7 +284,7 @@ public abstract class PanelView extends FrameLayout {
|| mInitialOffsetOnTouch == 0f)) { || mInitialOffsetOnTouch == 0f)) {
mTouchSlopExceeded = true; mTouchSlopExceeded = true;
if (waitForTouchSlop && !mTracking) { if (waitForTouchSlop && !mTracking) {
if (!mJustPeeked) { if (!mJustPeeked && mInitialOffsetOnTouch != 0f) {
mInitialOffsetOnTouch = mExpandedHeight; mInitialOffsetOnTouch = mExpandedHeight;
mInitialTouchX = x; mInitialTouchX = x;
mInitialTouchY = y; mInitialTouchY = y;