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

Commit 80ee14eb authored by Selim Cinek's avatar Selim Cinek Committed by Android (Google) Code Review
Browse files

Merge "Fixed that disappear animations were disabled"

parents ecc53f48 2aab2fb7
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);