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

Commit 64bacdd5 authored by Beverly's avatar Beverly
Browse files

Allow resetTranslation on notification menu open

Only disallow resetting the translation if the menu is open if the
generic reset() method is being called, but not when the
resetTranslation() method is explicitly used.

Test: manual
Fixes: 155399215
Change-Id: I8dcd764ba559477fd17b01294c408734a35271b5
parent c4c9c0d5
Loading
Loading
Loading
Loading
+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();
        }