Merge "Don't reset notif translation when menu is open" into rvc-dev am: 04369a9429

Change-Id: Ie69bb0205b1d2702cfff27080d698ab8f799a7fe

packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java

@@ -1838,6 +1838,10 @@ public class ExpandableNotificationRow extends ActivatableNotificationView
     }
 
     public void resetTranslation() {
+        if (mMenuRow != null && mMenuRow.isMenuVisible()) {
+            return;
+        }
+
         if (mTranslateAnim != null) {
             mTranslateAnim.cancel();
         }