diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2014-10-31 00:16:29 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-31 00:16:29 +0000 |
| commit | 15962f1da5803523a51a9c3f29315d566c708f66 (patch) | |
| tree | 5227df4dbb221d1d336d1e86aac752b78edc7b4f /packages/SystemUI/src/com/android/systemui/statusbar | |
| parent | 0b2c319f4c6cf4c3bce3026d2ef7f051e8f2d4e2 (diff) | |
| parent | 196edbc9f650d1840116e625092b8e9f5727806f (diff) | |
| download | frameworks_base-15962f1da5803523a51a9c3f29315d566c708f66.zip frameworks_base-15962f1da5803523a51a9c3f29315d566c708f66.tar.gz frameworks_base-15962f1da5803523a51a9c3f29315d566c708f66.tar.bz2 | |
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
Diffstat (limited to 'packages/SystemUI/src/com/android/systemui/statusbar')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java index 0ddda8a..0cf2d05 100644 --- 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; |