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

Update color bar defaults to use theme attr colors

Browse Source 
am: b40b0d2006

* commit 'b40b0d20066aeb53ae69e57979a92c337d0100df':
  Update color bar defaults to use theme attr colors

Change-Id: I6e2fc7d85f6b895a2ee3dfbc0912e0f1adb2dd98
This commit is contained in:
Andrew Sapperstein
2016-05-25 03:45:41 +00:00
committed by android-build-merger
parent 1883bc5c3c b40b0d2006
commit d6d7eaf95f
3 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/values/colors.xml
View File

@@ -98,9 +98,6 @@
<!-- Accent color that matches the settings launcher icon -->
<color name="icon_accent">#ffabffec</color>
<color name="summary_default_start">#ff009587</color>
<color name="summary_default_end">#ffced7db</color>
<color name="importance_icon_tint">#8a000000</color>
<color name="importance_disabled_tint">#4d000000</color>

6
src/com/android/settings/SummaryPreference.java
View File

@@ -33,6 +33,7 @@ public class SummaryPreference extends Preference {
private String mUnits;
private int mLeft, mMiddle, mRight;
private boolean mColorsSet = false;
private float mLeftRatio, mMiddleRatio, mRightRatio;
private String mStartLabel;
private String mEndLabel;
@@ -40,8 +41,6 @@ public class SummaryPreference extends Preference {
public SummaryPreference(Context context, AttributeSet attrs) {
super(context, attrs);
setLayoutResource(R.layout.settings_summary_preference);
mLeft = context.getColor(R.color.summary_default_start);
mRight = context.getColor(R.color.summary_default_end);
}
public void setAmount(String amount) {
@@ -77,6 +76,7 @@ public class SummaryPreference extends Preference {
mLeft = left;
mMiddle = middle;
mRight = right;
mColorsSet = true;
notifyChanged();
}
@@ -86,7 +86,9 @@ public class SummaryPreference extends Preference {
LinearColorBar colorBar = (LinearColorBar) holder.itemView.findViewById(R.id.color_bar);
colorBar.setRatios(mLeftRatio, mMiddleRatio, mRightRatio);
if (mColorsSet) {
colorBar.setColors(mLeft, mMiddle, mRight);
}
if (!TextUtils.isEmpty(mStartLabel) || !TextUtils.isEmpty(mEndLabel)) {
holder.findViewById(R.id.label_bar).setVisibility(View.VISIBLE);

13
src/com/android/settings/applications/LinearColorBar.java
View File

@@ -4,6 +4,7 @@
package com.android.settings.applications;
import android.content.Context;
import android.content.res.Resources;
import android.graphics.Canvas;
import android.graphics.LinearGradient;
import android.graphics.Paint;
@@ -12,12 +13,12 @@ import android.graphics.Rect;
import android.graphics.Shader;
import android.util.AttributeSet;
import android.util.DisplayMetrics;
import android.util.TypedValue;
import android.view.MotionEvent;
import android.widget.LinearLayout;
public class LinearColorBar extends LinearLayout {
static final int LEFT_COLOR = 0xff009688;
static final int MIDDLE_COLOR = 0xff009688;
static final int RIGHT_COLOR = 0xffced7db;
static final int GRAY_COLOR = 0xff555555;
static final int WHITE_COLOR = 0xffffffff;
@@ -26,8 +27,8 @@ public class LinearColorBar extends LinearLayout {
private float mYellowRatio;
private float mGreenRatio;
private int mLeftColor = LEFT_COLOR;
private int mMiddleColor = MIDDLE_COLOR;
private int mLeftColor;
private int mMiddleColor;
private int mRightColor = RIGHT_COLOR;
private boolean mShowIndicator = true;
@@ -71,6 +72,10 @@ public class LinearColorBar extends LinearLayout {
mEdgeGradientPaint.setStrokeWidth(mLineWidth);
mEdgeGradientPaint.setAntiAlias(true);
Resources.Theme theme = context.getTheme();
TypedValue typedValue = new TypedValue();
theme.resolveAttribute(android.R.attr.colorAccent, typedValue, true);
mLeftColor = mMiddleColor = context.getColor(typedValue.resourceId);
}
public void setOnRegionTappedListener(OnRegionTappedListener listener) {