Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d3fd50c1 authored by Beverly Tai's avatar Beverly Tai Committed by Automerger Merge Worker
Browse files

Merge "Allow resetTranslation on notification menu open" into rvc-dev am: 078fb920 am: 928a546a 

Change-Id: Icb800de694c01e22c71a7169ba927c9119f63a38
parents 9a083dda 928a546a

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

+3 −5
Original line number Diff line number Diff line
@@ -1680,7 +1680,9 @@ public class ExpandableNotificationRow extends ActivatableNotificationView 
    public void reset() {

        mShowingPublicInitialized = false;

        unDismiss();

        if (mMenuRow == null || !mMenuRow.isMenuVisible()) {

            resetTranslation();

        }

        onHeightReset();

        requestLayout();

    }
@@ -1838,10 +1840,6 @@ public class ExpandableNotificationRow extends ActivatableNotificationView 
    }



    public void resetTranslation() {

        if (mMenuRow != null && mMenuRow.isMenuVisible()) {

            return;

        }



        if (mTranslateAnim != null) {

            mTranslateAnim.cancel();

        }