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

Commit 1bff6eb4 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 

Change-Id: I9a057ae1bad8cd5081058519edf59d0114277c6d
parents 6be27c51 078fb920

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();

        }