Merge "Make status bar expanding more tightly coupled to finger" into lmp-mr1-dev

This commit is contained in:
Jorim Jaggi
2014-10-30 14:51:44 +00:00
committed by Android (Google) Code Review

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;