commit 787a0af8ebba004a6f1cd3bfe8c78d851003d227
author Jorim Jaggi <jjaggi@google.com> Wed Jun 04 18:57:14 2014 +0200
committer Jorim Jaggi <jjaggi@google.com> Wed Jun 04 18:57:14 2014 +0200
tree 8244f9762f3ed9341ecc72f6219c2d15d7855d3f
parent 6a247199bae1ef4d8e4fa02977e6641bcb9bcde8

Fix not being able to dismiss notifications with tap.

Also fixes that the go-to-shade gesture sometimes triggers the unlock
hint animation.

Bug: 14487435
Bug: 15421928
Change-Id: Ie7e01c81a397b9b1a03baed82c1270ba4e7eb799

packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java

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 5442bc9..89a1907 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java
@@ -162,7 +162,7 @@
                     if (mHeightAnimator != null) {
                         mHeightAnimator.cancel(); // end any outstanding animations
                     }
-                    mTouchSlopExceeded = true;
+                    mTouchSlopExceeded = (mHeightAnimator != null && !mHintAnimationRunning);
                     onTrackingStarted();
                 }
                 if (mExpandedHeight == 0) {
@@ -219,7 +219,8 @@
             case MotionEvent.ACTION_CANCEL:
                 mTrackingPointer = -1;
                 trackMovement(event);
-                if (mTracking && mTouchSlopExceeded) {
+                if ((mTracking && mTouchSlopExceeded)
+                        || event.getActionMasked() == MotionEvent.ACTION_CANCEL) {
                     float vel = getCurrentVelocity();
                     boolean expand = flingExpands(vel);
                     onTrackingStopped(expand);