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

Commit 85d151bd authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Limit primary text color to notification shelf icons" into sc-dev am: 452d2916 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13930906

Change-Id: I1dfb13f7a1a3cdc20c28c01d7984b22e5a27eb5e
parents 09d91d06 452d2916

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

+1 −0
Original line number Diff line number Diff line
@@ -132,6 +132,7 @@ public class NotificationShelf extends ActivatableNotificationView implements 
        mHiddenShelfIconSize = res.getDimensionPixelOffset(R.dimen.hidden_shelf_icon_size);

        mGapHeight = res.getDimensionPixelSize(R.dimen.qs_notification_padding);



        mShelfIcons.setInNotificationIconShelf(true);

        if (!mShowNotificationShelf) {

            setVisibility(GONE);

        }

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

+6 −1
Original line number Diff line number Diff line
@@ -152,6 +152,7 @@ public class NotificationIconContainer extends AlphaOptimizedFrameLayout { 
    private boolean mDozing;

    private boolean mOnLockScreen;

    private int mLockScreenMode = KeyguardUpdateMonitor.LOCK_SCREEN_MODE_NORMAL;

    private boolean mInNotificationIconShelf;

    private boolean mChangingViewPositions;

    private int mAddAnimationStartIndex = -1;

    private int mCannedAnimationStartIndex = -1;
@@ -702,6 +703,10 @@ public class NotificationIconContainer extends AlphaOptimizedFrameLayout { 
        mLockScreenMode = lockScreenMode;

    }



    public void setInNotificationIconShelf(boolean inShelf) {

        mInNotificationIconShelf = inShelf;

    }



    public class IconState extends ViewState {

        public static final int NO_VALUE = NotificationIconContainer.NO_VALUE;

        public float iconAppearAmount = 1.0f;
@@ -813,7 +818,7 @@ public class NotificationIconContainer extends AlphaOptimizedFrameLayout { 
                    }

                }

                icon.setVisibleState(visibleState, animationsAllowed);

                icon.setIconColor(mThemedTextColorPrimary,

                icon.setIconColor(mInNotificationIconShelf ? mThemedTextColorPrimary : iconColor,

                        needsCannedAnimation && animationsAllowed);

                if (animate) {

                    animateTo(icon, animationProperties);