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

Merge "Fix mobile signal colors to match wifi et al" into oc-dr1-dev am: ed4d5fc925

Browse Source 
am: d0ee6987e1

Change-Id: I4e67ee75df6c53cf6a8133dc44cdb97dc9ab1a24
This commit is contained in:
Evan Laird
2017-07-14 21:30:36 +00:00
committed by android-build-merger
parent e38db1b9be d0ee6987e1
commit 4a0e741124
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packages/SystemUI/src/com/android/systemui/qs/CellTileView.java
View File

@@ -16,12 +16,14 @@ package com.android.systemui.qs;
import android.content.Context;
import android.graphics.drawable.Drawable;
import android.service.quicksettings.Tile;
import android.widget.ImageView;
import com.android.settingslib.Utils;
import com.android.systemui.R;
import com.android.systemui.plugins.qs.QSTile.Icon;
import com.android.systemui.plugins.qs.QSTile.State;
import com.android.systemui.qs.tileimpl.QSTileImpl;
import com.android.systemui.statusbar.phone.SignalDrawable;
import java.util.Objects;
@@ -35,7 +37,8 @@ public class CellTileView extends SignalTileView {
public CellTileView(Context context) {
super(context);
mSignalDrawable = new SignalDrawable(mContext);
mSignalDrawable.setDarkIntensity(isDark(mContext));
mSignalDrawable.setColors(QSTileImpl.getColorForState(context, Tile.STATE_UNAVAILABLE),
QSTileImpl.getColorForState(context, Tile.STATE_ACTIVE));
mSignalDrawable.setIntrinsicSize(context.getResources().getDimensionPixelSize(
R.dimen.qs_tile_icon_size));
}
@@ -48,10 +51,6 @@ public class CellTileView extends SignalTileView {
}
}
private static int isDark(Context context) {
return Utils.getColorAttr(context, android.R.attr.colorForeground) == 0xff000000 ? 1 : 0;
}
public static class SignalIcon extends Icon {
private final int mState;
@@ -68,7 +67,8 @@ public class CellTileView extends SignalTileView {
public Drawable getDrawable(Context context) {
//TODO: Not the optimal solution to create this drawable
SignalDrawable d = new SignalDrawable(context);
d.setDarkIntensity(isDark(context));
d.setColors(QSTileImpl.getColorForState(context, Tile.STATE_UNAVAILABLE),
QSTileImpl.getColorForState(context, Tile.STATE_ACTIVE));
d.setLevel(getState());
return d;
}

5
packages/SystemUI/src/com/android/systemui/statusbar/phone/SignalDrawable.java
View File

@@ -199,6 +199,11 @@ public class SignalDrawable extends Drawable {
return true;
}
public void setColors(int background, int foreground) {
mPaint.setColor(background);
mForegroundPaint.setColor(foreground);
}
public void setDarkIntensity(float darkIntensity) {
if (darkIntensity == mOldDarkIntensity) {
return;