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

Commit 04d615da authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Always remove IconState in onViewRemoved, even if animations are off" into qt-dev

parents d90f23c6 fab34160

packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationIconContainer.java

+4 −3
Original line number Diff line number Diff line
@@ -315,10 +315,11 @@ public class NotificationIconContainer extends AlphaOptimizedFrameLayout { 
    @Override

    public void onViewRemoved(View child) {

        super.onViewRemoved(child);

        if (mAnimationsEnabled && child instanceof StatusBarIconView) {



        if (child instanceof StatusBarIconView) {

            boolean isReplacingIcon = isReplacingIcon(child);

            final StatusBarIconView icon = (StatusBarIconView) child;

            if (icon.getVisibleState() != StatusBarIconView.STATE_HIDDEN

            if (mAnimationsEnabled && icon.getVisibleState() != StatusBarIconView.STATE_HIDDEN

                    && child.getVisibility() == VISIBLE && isReplacingIcon) {

                int animationStartIndex = findFirstViewIndexAfter(icon.getTranslationX());

                if (mAddAnimationStartIndex < 0) {
@@ -329,7 +330,7 @@ public class NotificationIconContainer extends AlphaOptimizedFrameLayout { 
            }

            if (!mChangingViewPositions) {

                mIconStates.remove(child);

                if (!isReplacingIcon) {

                if (mAnimationsEnabled && !isReplacingIcon) {

                    addTransientView(icon, 0);

                    boolean isIsolatedIcon = child == mIsolatedIcon;

                    icon.setVisibleState(StatusBarIconView.STATE_HIDDEN, true /* animate */,