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

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

Merge "Limit primary text color to notification shelf icons" into sc-dev

parents 1dfc2561 3ed24d80

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

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

        mHiddenShelfIconSize = res.getDimensionPixelOffset(R.dimen.hidden_shelf_icon_size);

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

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





        mShelfIcons.setInNotificationIconShelf(true);

        if (!mShowNotificationShelf) {

        if (!mShowNotificationShelf) {

            setVisibility(GONE);

            setVisibility(GONE);

        }

        }

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

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

    private boolean mDozing;

    private boolean mOnLockScreen;

    private boolean mOnLockScreen;

    private int mLockScreenMode = KeyguardUpdateMonitor.LOCK_SCREEN_MODE_NORMAL;

    private int mLockScreenMode = KeyguardUpdateMonitor.LOCK_SCREEN_MODE_NORMAL;

    private boolean mInNotificationIconShelf;

    private boolean mChangingViewPositions;

    private boolean mChangingViewPositions;

    private int mAddAnimationStartIndex = -1;

    private int mAddAnimationStartIndex = -1;

    private int mCannedAnimationStartIndex = -1;

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

        mLockScreenMode = lockScreenMode;

    }

    }





    public void setInNotificationIconShelf(boolean inShelf) {

        mInNotificationIconShelf = inShelf;

    }



    public class IconState extends ViewState {

    public class IconState extends ViewState {

        public static final int NO_VALUE = NotificationIconContainer.NO_VALUE;

        public static final int NO_VALUE = NotificationIconContainer.NO_VALUE;

        public float iconAppearAmount = 1.0f;

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

                    }

                }

                }

                icon.setVisibleState(visibleState, animationsAllowed);

                icon.setVisibleState(visibleState, animationsAllowed);

                icon.setIconColor(mThemedTextColorPrimary,

                icon.setIconColor(mInNotificationIconShelf ? mThemedTextColorPrimary : iconColor,

                        needsCannedAnimation && animationsAllowed);

                        needsCannedAnimation && animationsAllowed);

                if (animate) {

                if (animate) {

                    animateTo(icon, animationProperties);

                    animateTo(icon, animationProperties);