diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2014-10-30 14:51:44 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-30 14:51:45 +0000 |
| commit | cdbdbe3a54f46cbe885fb2bb27d5e79297730bf0 (patch) | |
| tree | d2cd34c04a9efea3030ab6069e9d950e841b110f /packages/SystemUI/src/com/android/systemui/statusbar | |
| parent | 2905cafcb898bccb1f52e77f3c2f7eb5fc9fe01f (diff) | |
| parent | 0b1528aac46007f94f0e073143708240b0c7c144 (diff) | |
| download | frameworks_base-cdbdbe3a54f46cbe885fb2bb27d5e79297730bf0.zip frameworks_base-cdbdbe3a54f46cbe885fb2bb27d5e79297730bf0.tar.gz frameworks_base-cdbdbe3a54f46cbe885fb2bb27d5e79297730bf0.tar.bz2 | |
Merge "Make status bar expanding more tightly coupled to finger" into lmp-mr1-dev
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; |