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

Commit fabf0461 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge "Fixed that the icon could dissappear" into oc-dev am: 58b39a1f am: c7e9cdea"

parents 564f55fe fb01ab4e

packages/SystemUI/src/com/android/systemui/statusbar/NotificationShelf.java

+2 −1
Original line number Diff line number Diff line
@@ -434,7 +434,8 @@ public class NotificationShelf extends ActivatableNotificationView implements 
                iconState.scaleY = 1.0f;

                iconState.hidden = false;

            }

            if (row.isAboveShelf() || (!row.isInShelf() && isLastChild && row.areGutsExposed())) {

            if (row.isAboveShelf() || (!row.isInShelf() && (isLastChild && row.areGutsExposed()

                    || row.getTranslationZ() > mAmbientState.getBaseZHeight()))) {

                iconState.hidden = true;

            }

            int shelfColor = icon.getStaticDrawableColor();

packages/SystemUI/src/com/android/systemui/statusbar/stack/ViewState.java

+3 −2
Original line number Diff line number Diff line
@@ -190,7 +190,9 @@ public class ViewState { 
            view.setScaleY(scaleY);

        }



        boolean becomesInvisible = this.alpha == 0.0f || (this.hidden && !isAnimating(view));

        int oldVisibility = view.getVisibility();

        boolean becomesInvisible = this.alpha == 0.0f

                || (this.hidden && (!isAnimating(view) || oldVisibility != View.VISIBLE));

        boolean animatingAlpha = isAnimating(view, TAG_ANIMATOR_ALPHA);

        if (animatingAlpha) {

            updateAlphaAnimation(view);
@@ -212,7 +214,6 @@ public class ViewState { 
        }



        // apply visibility

        int oldVisibility = view.getVisibility();

        int newVisibility = becomesInvisible ? View.INVISIBLE : View.VISIBLE;

        if (newVisibility != oldVisibility) {

            if (!(view instanceof ExpandableView) || !((ExpandableView) view).willBeGone()) {