PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 48424d9d: am 84cd3bfb: am 0732a646: Merge "Fix some dark theme issues" into mnc-dev

Browse Source 
* commit '48424d9def5175cc03ca722bcd73bf7cf3267f9d':
  Fix some dark theme issues
This commit is contained in:
Jason Monk
2015-06-03 19:23:47 +00:00
committed by Android Git Automerger
parent 37622f29d8 48424d9def
commit 53f7cddd94
13 changed files with 62 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/widget/ChartSweepView.java
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;