Fix some dark theme issues (Take 2)

Now with visible lock patterns! Both light and dark!

Bug: 21117509
Bug: 21077345
Bug: 21480587
Bug: 21621900
Change-Id: Ibcf822faf7cbc83be43d757e0a6a9432ef3346af
This commit is contained in:
Jason Monk
2015-06-03 10:53:03 -04:00
parent fb32790adc
commit 2d499533b7
15 changed files with 69 additions and 20 deletions

View File

@@ -123,14 +123,15 @@ public class ChartSweepView extends View {
final TypedArray a = context.obtainStyledAttributes(
attrs, R.styleable.ChartSweepView, defStyle, 0);
setSweepDrawable(a.getDrawable(R.styleable.ChartSweepView_sweepDrawable));
final int color = a.getColor(R.styleable.ChartSweepView_labelColor, Color.BLUE);
setSweepDrawable(a.getDrawable(R.styleable.ChartSweepView_sweepDrawable), color);
setFollowAxis(a.getInt(R.styleable.ChartSweepView_followAxis, -1));
setNeighborMargin(a.getDimensionPixelSize(R.styleable.ChartSweepView_neighborMargin, 0));
setSafeRegion(a.getDimensionPixelSize(R.styleable.ChartSweepView_safeRegion, 0));
setLabelMinSize(a.getDimensionPixelSize(R.styleable.ChartSweepView_labelSize, 0));
setLabelTemplate(a.getResourceId(R.styleable.ChartSweepView_labelTemplate, 0));
setLabelColor(a.getColor(R.styleable.ChartSweepView_labelColor, Color.BLUE));
setLabelColor(color);
// TODO: moved focused state directly into assets
setBackgroundResource(R.drawable.data_usage_sweep_background);
@@ -213,7 +214,7 @@ public class ChartSweepView extends View {
requestLayout();
}
public void setSweepDrawable(Drawable sweep) {
public void setSweepDrawable(Drawable sweep, int color) {
if (mSweep != null) {
mSweep.setCallback(null);
unscheduleDrawable(mSweep);
@@ -226,6 +227,8 @@ public class ChartSweepView extends View {
}
sweep.setVisible(getVisibility() == VISIBLE, false);
mSweep = sweep;
// Match the text.
mSweep.setTint(color);
sweep.getPadding(mSweepPadding);
} else {
mSweep = null;