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

Commit 2e50200c authored by Selim Cinek's avatar Selim Cinek Committed by android-build-merger
Browse files

Merge "Fixed an icon flickering when adding a notification" into oc-dr1-dev am: aa481d69 

am: f55beccb

Change-Id: Ib2c2681f6c219d5b8206280341904effe104b540
parents 9edbabb3 f55beccb

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

+4 −0
Original line number Diff line number Diff line
@@ -952,6 +952,10 @@ public abstract class ActivatableNotificationView extends ExpandableOutlineView 
        }

    }



    public boolean isDrawingAppearAnimation() {

        return mDrawingAppearAnimation;

    }



    @Override

    protected void dispatchDraw(Canvas canvas) {

        if (mDrawingAppearAnimation) {

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

+5 −0
Original line number Diff line number Diff line
@@ -505,6 +505,11 @@ public class NotificationShelf extends ActivatableNotificationView implements 
            iconState.scaleX = newSize / icon.getHeight() / icon.getIconScale();

            iconState.scaleY = iconState.scaleX;

            iconState.hidden = transitionAmount == 0.0f && !iconState.isAnimating(icon);

            boolean isAppearing = row.isDrawingAppearAnimation() && !row.isInShelf();

            if (isAppearing) {

                iconState.hidden = true;

                iconState.iconAppearAmount = 0.0f;

            }

            iconState.alpha = alpha;

            iconState.yTranslation = iconYTranslation;

            if (stayingInShelf) {