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

Change-Id: Ie2c1a0fc633f141bf2130833ca7a4a25b253fd7b
2020-04-28 18:45:41 +00:00
parent 8a893d1f66 05759938f8
commit 4b97c94753
1 changed files with 4 additions and 0 deletions
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java
+++ b/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();
        }