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

Merge "[SettingsLib] Update Utils APIs usage"

Browse Source
This commit is contained in:
Jason Chang
2018-04-12 12:44:04 +00:00
committed by Android (Google) Code Review
parent a28b67ad81 c44097d345
commit a29ed7ef71
8 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/datausage/ChartDataUsagePreference.java
View File

@@ -50,8 +50,8 @@ public class ChartDataUsagePreference extends Preference {
public ChartDataUsagePreference(Context context, AttributeSet attrs) {
super(context, attrs);
setSelectable(false);
mLimitColor = Utils.getColorAttr(context, android.R.attr.colorError);
mWarningColor = Utils.getColorAttr(context, android.R.attr.textColorSecondary);
mLimitColor = Utils.getColorAttrDefaultColor(context, android.R.attr.colorError);
mWarningColor = Utils.getColorAttrDefaultColor(context, android.R.attr.textColorSecondary);
setLayoutResource(R.layout.data_usage_graph);
}

2
src/com/android/settings/deviceinfo/StorageVolumePreference.java
View File

@@ -106,7 +106,7 @@ public class StorageVolumePreference extends Preference {
}
if (freeBytes < mStorageManager.getStorageLowBytes(path)) {
mColor = Utils.getColorAttr(context, android.R.attr.colorError);
mColor = Utils.getColorAttrDefaultColor(context, android.R.attr.colorError);
icon = context.getDrawable(R.drawable.ic_warning_24dp);
}

2
src/com/android/settings/deviceinfo/storage/UserProfileController.java
View File

@@ -130,7 +130,7 @@ public class UserProfileController extends AbstractPreferenceController implemen
private static Drawable applyTint(Context context, Drawable icon) {
icon = icon.mutate();
icon.setTint(Utils.getColorAttr(context, android.R.attr.colorControlNormal));
icon.setTintList(Utils.getColorAttr(context, android.R.attr.colorControlNormal));
return icon;
}

3
src/com/android/settings/fuelgauge/BatteryMeterView.java
View File

@@ -51,7 +51,8 @@ public class BatteryMeterView extends ImageView {
final int frameColor = context.getColor(R.color.meter_background_color);
mAccentColorFilter = new PorterDuffColorFilter(
Utils.getColorAttr(context, android.R.attr.colorAccent), PorterDuff.Mode.SRC_IN);
Utils.getColorAttrDefaultColor(context, android.R.attr.colorAccent),
PorterDuff.Mode.SRC_IN);
mErrorColorFilter = new PorterDuffColorFilter(
context.getColor(R.color.battery_icon_color_error), PorterDuff.Mode.SRC_IN);

4
src/com/android/settings/fuelgauge/BatterySaverDrawable.java
View File

@@ -37,7 +37,7 @@ public class BatterySaverDrawable extends BatteryMeterDrawableBase {
setPowerSave(true);
setCharging(false);
setPowerSaveAsColorError(false);
final int tintColor = Utils.getColorAttr(context, android.R.attr.colorAccent);
final int tintColor = Utils.getColorAttrDefaultColor(context, android.R.attr.colorAccent);
setColorFilter(new PorterDuffColorFilter(tintColor, PorterDuff.Mode.SRC_IN));
}
}
}

5
src/com/android/settings/widget/DonutView.java
View File

@@ -70,7 +70,8 @@ public class DonutView extends View {
public DonutView(Context context, AttributeSet attrs) {
super(context, attrs);
mMeterBackgroundColor = context.getColor(R.color.meter_background_color);
mMeterConsumedColor = Utils.getDefaultColor(mContext, R.color.meter_consumed_color);
mMeterConsumedColor = Utils.getColorStateListDefaultColor(mContext,
R.color.meter_consumed_color);
boolean applyColorAccent = true;
Resources resources = context.getResources();
mStrokeWidth = resources.getDimension(R.dimen.storage_donut_thickness);
@@ -107,7 +108,7 @@ public class DonutView extends View {
if (applyColorAccent) {
final ColorFilter mAccentColorFilter =
new PorterDuffColorFilter(
Utils.getColorAttr(context, android.R.attr.colorAccent),
Utils.getColorAttrDefaultColor(context, android.R.attr.colorAccent),
PorterDuff.Mode.SRC_IN);
mBackgroundCircle.setColorFilter(mAccentColorFilter);
mFilledArc.setColorFilter(mAccentColorFilter);

3
src/com/android/settings/widget/EntityHeaderController.java
View File

@@ -307,7 +307,8 @@ public class EntityHeaderController {
return this;
}
actionBar.setBackgroundDrawable(
new ColorDrawable(Utils.getColorAttr(activity, android.R.attr.colorPrimary)));
new ColorDrawable(
Utils.getColorAttrDefaultColor(activity, android.R.attr.colorPrimary)));
actionBar.setElevation(0);
if (mRecyclerView != null && mLifecycle != null) {
ActionBarShadowController.attachToRecyclerView(mActivity, mLifecycle, mRecyclerView);