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

Revert "Fix some dark theme issues"

Browse Source 
This breaks the pattern entry screens of SecuritySettings.  Reverting until we can take a closer look.


This reverts commit cb8ccbb3b5.

Change-Id: Ifb3c46198de30914aff3a33df84971b1b31ab227
This commit is contained in:
Jim Miller
2015-06-04 02:45:40 +00:00
parent cb8ccbb3b5
commit 6433bd8f6a
13 changed files with 18 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/widget/ChartSweepView.java
View File

@@ -123,15 +123,14 @@ public class ChartSweepView extends View {
final TypedArray a = context.obtainStyledAttributes(
attrs, R.styleable.ChartSweepView, defStyle, 0);
final int color = a.getColor(R.styleable.ChartSweepView_labelColor, Color.BLUE);
setSweepDrawable(a.getDrawable(R.styleable.ChartSweepView_sweepDrawable), color);
setSweepDrawable(a.getDrawable(R.styleable.ChartSweepView_sweepDrawable));
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(color);
setLabelColor(a.getColor(R.styleable.ChartSweepView_labelColor, Color.BLUE));
// TODO: moved focused state directly into assets
setBackgroundResource(R.drawable.data_usage_sweep_background);
@@ -214,7 +213,7 @@ public class ChartSweepView extends View {
requestLayout();
}
public void setSweepDrawable(Drawable sweep, int color) {
public void setSweepDrawable(Drawable sweep) {
if (mSweep != null) {
mSweep.setCallback(null);
unscheduleDrawable(mSweep);
@@ -227,8 +226,6 @@ public class ChartSweepView extends View {
}
sweep.setVisible(getVisibility() == VISIBLE, false);
mSweep = sweep;
// Match the text.
mSweep.setTint(color);
sweep.getPadding(mSweepPadding);
} else {
mSweep = null;