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

Commit 51ff5776 authored by Evan Laird's avatar Evan Laird Committed by android-build-merger
Browse files

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

am: 04d615da

Change-Id: I1cae438bb250a78413845e8e7d622967a2f7cb56
parents 854cf037 04d615da

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

+4 −3
Original line number Diff line number Diff line
@@ -316,10 +316,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) {
@@ -330,7 +331,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 */,