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

Commit 2aab2fb7 authored by Selim Cinek's avatar Selim Cinek
Browse files

Fixed that disappear animations were disabled

Bug: 20165559
Change-Id: I44fd10aee1ad4107ffcf98e103cd8054afb83731
parent 60122be6
Loading
Loading
Loading
Loading
+5 −15
Original line number Diff line number Diff line
@@ -220,7 +220,6 @@ public class NotificationStackScrollLayout extends ViewGroup
    private PhoneStatusBar mPhoneStatusBar;
    private int[] mTempInt2 = new int[2];
    private boolean mGenerateChildOrderChangedEvent;
    private boolean mRemoveAnimationEnabled;
    private HashSet<Runnable> mAnimationFinishedRunnables = new HashSet<>();
    private HashSet<Pair<ExpandableNotificationRow, Boolean>> mHeadsUpChangeAnimations
            = new HashSet<>();
@@ -1630,17 +1629,12 @@ public class NotificationStackScrollLayout extends ViewGroup
        ((ExpandableView) child).setOnHeightChangedListener(null);
        mCurrentStackScrollState.removeViewStateForView(child);
        updateScrollStateForRemovedChild(child);
        if (mRemoveAnimationEnabled) {
        boolean animationGenerated = generateRemoveAnimation(child);
        if (animationGenerated && !mSwipedOutViews.contains(child)) {
            // Add this view to an overlay in order to ensure that it will still be temporary
            // drawn when removed
            getOverlay().add(child);
        }
        } else {
            // TODO: handle this more cleanly when HEADS-up and the shade are merged
            requestAnimateEverything();
        }
        updateAnimationState(false, child);

        // Make sure the clipRect we might have set is removed
@@ -2631,10 +2625,6 @@ public class NotificationStackScrollLayout extends ViewGroup
        return touchY > mIntrinsicPadding;
    }

    public void setRemoveAnimationEnabled(boolean enabled) {
        mRemoveAnimationEnabled = enabled;
    }

    private void updateExpandButtons() {
        for (int i = 0; i < getChildCount(); i++) {
            View child = getChildAt(i);