commit f9eb4e87168cdf58766034a2b0020c274e457a12
author Mady Mellor <madym@google.com> Fri Apr 14 20:54:56 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Apr 14 20:54:56 2017 +0000
tree 674bfb40382a703f7e53bcb7fb9fb642298315ab
parent cd9d4b14913d46bed6273bb361642c5e28aae36c
parent daf76b82aeb83d3070fa9d5051be8438f0acde21

Merge "Fix issue where menu items visible on 'closed' notification on lockscreen" into oc-dev am: 4b7b01c1cc
am: daf76b82ae

Change-Id: Ia7b9f62d9040a98193e0ed79a259e0741538f494

packages/SystemUI/src/com/android/systemui/statusbar/NotificationMenuRow.java

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationMenuRow.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationMenuRow.java
index 2a1e063..fee24b7 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationMenuRow.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationMenuRow.java
@@ -306,6 +306,10 @@
     }
 
     private void snapBack(View animView, float velocity) {
+        if (mFadeAnimator != null) {
+            mFadeAnimator.cancel();
+        }
+        mHandler.removeCallbacks(mCheckForDrag);
         mMenuSnappedTo = false;
         mSnapping = true;
         mSwipeHelper.snap(animView, 0 /* leftTarget */, velocity);