From 9e87dd0d31c0a3320d29ded29338c451ecdb69a6 Mon Sep 17 00:00:00 2001
From: Mady Mellor <madym@google.com>
Date: Wed, 12 Apr 2017 11:21:56 -0700
Subject: [PATCH] Fix issue where menu items visible on 'closed' notification
 on lockscreen

Needed to cancel / remove check for the fade in animator when the
notification gets snapped back since the icons shouldn't show in this case.

Test: manual
Bug: 37260033
Change-Id: I5b5ce51f930025dc819a8578f2285c60fa041e7c
---
 .../com/android/systemui/statusbar/NotificationMenuRow.java   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationMenuRow.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationMenuRow.java
index bb82b602afbb4..ff4c9a0fdfd3d 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationMenuRow.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationMenuRow.java
@@ -273,6 +273,10 @@ public class NotificationMenuRow implements NotificationMenuRowPlugin, View.OnCl
     }
 
     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);