diff options
author | Jorim Jaggi <jjaggi@google.com> | 2014-05-07 17:45:31 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-07 17:45:31 +0000 |
commit | 2322ae82e9bbd0683eb86ae0f70050e76e44a30d (patch) | |
tree | f2181006c8cd9f10ab6fc3dc7dca8fad8b0e62d1 /packages | |
parent | 11da8a8aee1bb0b72c06a62db4e976bf578e6695 (diff) | |
parent | 172e914178181cf1c5999722fc0817e8ac2097f1 (diff) | |
download | frameworks_base-2322ae82e9bbd0683eb86ae0f70050e76e44a30d.zip frameworks_base-2322ae82e9bbd0683eb86ae0f70050e76e44a30d.tar.gz frameworks_base-2322ae82e9bbd0683eb86ae0f70050e76e44a30d.tar.bz2 |
Merge "Improved interception logic of the PanelView"
Diffstat (limited to 'packages')
-rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java | 7 |
1 files changed, 5 insertions, 2 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 0cdca66..a853b2a 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java @@ -526,11 +526,14 @@ public class PanelView extends FrameLayout { switch (event.getActionMasked()) { case MotionEvent.ACTION_DOWN: + if (mTimeAnimator.isRunning()) { + mTimeAnimator.cancel(); // end any outstanding animations + return true; + } mInitialTouchY = y; mInitialTouchX = x; initVelocityTracker(); trackMovement(event); - mTimeAnimator.cancel(); // end any outstanding animations break; case MotionEvent.ACTION_POINTER_UP: final int upPointer = event.getPointerId(event.getActionIndex()); @@ -569,7 +572,7 @@ public class PanelView extends FrameLayout { } protected boolean isScrolledToBottom() { - return false; + return true; } protected float getContentHeight() { |