Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Fabian Kozynski
2021-02-18 14:15:53 +00:00
committed by Android (Google) Code Review
parent 8c7cbddb79 4434cec8ae
commit ef1fdf1849
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java
View File

@@ -90,6 +90,7 @@ public class QuickStatusBarHeader extends RelativeLayout implements LifecycleOwn
private OngoingPrivacyChip mPrivacyChip; private OngoingPrivacyChip mPrivacyChip;
private Space mSpace; private Space mSpace;
private BatteryMeterView mBatteryRemainingIcon; private BatteryMeterView mBatteryRemainingIcon;
private TintedIconManager mTintedIconManager;
// Used for RingerModeTracker // Used for RingerModeTracker
private final LifecycleRegistry mLifecycle = new LifecycleRegistry(this); private final LifecycleRegistry mLifecycle = new LifecycleRegistry(this);
@@ -144,6 +145,7 @@ public class QuickStatusBarHeader extends RelativeLayout implements LifecycleOwn
} }
void onAttach(TintedIconManager iconManager) { void onAttach(TintedIconManager iconManager) {
mTintedIconManager = iconManager;
int fillColor = Utils.getColorAttrDefaultColor(getContext(), int fillColor = Utils.getColorAttrDefaultColor(getContext(),
android.R.attr.textColorPrimary); android.R.attr.textColorPrimary);
@@ -268,6 +270,9 @@ public class QuickStatusBarHeader extends RelativeLayout implements LifecycleOwn
android.R.attr.textColorSecondary); android.R.attr.textColorSecondary);
mTextColorPrimary = textColor; mTextColorPrimary = textColor;
mClockView.setTextColor(textColor); mClockView.setTextColor(textColor);
if (mTintedIconManager != null) {
mTintedIconManager.setTint(textColor);
}
mBatteryRemainingIcon.updateColors(mTextColorPrimary, textColorSecondary, mBatteryRemainingIcon.updateColors(mTextColorPrimary, textColorSecondary,
mTextColorPrimary); mTextColorPrimary);
} }

7
packages/SystemUI/src/com/android/systemui/statusbar/StatusBarMobileView.java
View File

@@ -24,7 +24,6 @@ import static com.android.systemui.statusbar.StatusBarIconView.STATE_ICON;
import android.content.Context; import android.content.Context;
import android.content.res.ColorStateList; import android.content.res.ColorStateList;
import android.graphics.Color;
import android.graphics.Rect; import android.graphics.Rect;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.util.FeatureFlagUtils; import android.util.FeatureFlagUtils;
@@ -238,11 +237,7 @@ public class StatusBarMobileView extends FrameLayout implements DarkReceiver,
@Override @Override
public void setStaticDrawableColor(int color) { public void setStaticDrawableColor(int color) {
ColorStateList list = ColorStateList.valueOf(color); ColorStateList list = ColorStateList.valueOf(color);
float intensity = color == Color.WHITE ? 0 : 1; mMobileDrawable.setTintList(list);
// 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)));
mIn.setImageTintList(list); mIn.setImageTintList(list);
mOut.setImageTintList(list); mOut.setImageTintList(list);
mMobileType.setImageTintList(list); mMobileType.setImageTintList(list);