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

Commit f1a14bcf authored by Fabian Kozynski's avatar Fabian Kozynski Committed by Automerger Merge Worker
Browse files

Merge "Fix signal color in dark mode" into sc-dev am: ef1fdf18 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I068c75204738839d4c327f10950435a24dc25585
parents 827eb87a ef1fdf18

packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java

+5 −0
Original line number Diff line number Diff line
@@ -90,6 +90,7 @@ public class QuickStatusBarHeader extends RelativeLayout implements LifecycleOwn 
    private OngoingPrivacyChip mPrivacyChip;

    private Space mSpace;

    private BatteryMeterView mBatteryRemainingIcon;

    private TintedIconManager mTintedIconManager;



    // Used for RingerModeTracker

    private final LifecycleRegistry mLifecycle = new LifecycleRegistry(this);
@@ -144,6 +145,7 @@ public class QuickStatusBarHeader extends RelativeLayout implements LifecycleOwn 
    }



    void onAttach(TintedIconManager iconManager) {

        mTintedIconManager = iconManager;

        int fillColor = Utils.getColorAttrDefaultColor(getContext(),

                android.R.attr.textColorPrimary);
@@ -268,6 +270,9 @@ public class QuickStatusBarHeader extends RelativeLayout implements LifecycleOwn 
                    android.R.attr.textColorSecondary);

            mTextColorPrimary = textColor;

            mClockView.setTextColor(textColor);

            if (mTintedIconManager != null) {

                mTintedIconManager.setTint(textColor);

            }

            mBatteryRemainingIcon.updateColors(mTextColorPrimary, textColorSecondary,

                    mTextColorPrimary);

        }

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

+1 −6
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ import static com.android.systemui.statusbar.StatusBarIconView.STATE_ICON; 


import android.content.Context;

import android.content.res.ColorStateList;

import android.graphics.Color;

import android.graphics.Rect;

import android.util.AttributeSet;

import android.util.FeatureFlagUtils;
@@ -238,11 +237,7 @@ public class StatusBarMobileView extends FrameLayout implements DarkReceiver, 
    @Override

    public void setStaticDrawableColor(int color) {

        ColorStateList list = ColorStateList.valueOf(color);

        float intensity = color == Color.WHITE ? 0 : 1;

        // We want the ability to change the theme from the one set by SignalDrawable in certain

        // surfaces. In this way, we can pass a theme to the view.

        mMobileDrawable.setTintList(

                ColorStateList.valueOf(mDualToneHandler.getSingleColor(intensity)));

        mMobileDrawable.setTintList(list);

        mIn.setImageTintList(list);

        mOut.setImageTintList(list);

        mMobileType.setImageTintList(list);