diff --git a/src/com/android/settings/datausage/ChartDataUsagePreference.java b/src/com/android/settings/datausage/ChartDataUsagePreference.java
index a6d04b65174..4c7fc8b2baa 100644
--- a/src/com/android/settings/datausage/ChartDataUsagePreference.java
+++ b/src/com/android/settings/datausage/ChartDataUsagePreference.java
@@ -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);
     }
 
diff --git a/src/com/android/settings/deviceinfo/StorageVolumePreference.java b/src/com/android/settings/deviceinfo/StorageVolumePreference.java
index 023b2a1b20a..6135acd2188 100644
--- a/src/com/android/settings/deviceinfo/StorageVolumePreference.java
+++ b/src/com/android/settings/deviceinfo/StorageVolumePreference.java
@@ -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);
             }
 
diff --git a/src/com/android/settings/deviceinfo/storage/UserProfileController.java b/src/com/android/settings/deviceinfo/storage/UserProfileController.java
index 510b0c0390e..05856cbb250 100644
--- a/src/com/android/settings/deviceinfo/storage/UserProfileController.java
+++ b/src/com/android/settings/deviceinfo/storage/UserProfileController.java
@@ -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;
     }
 
diff --git a/src/com/android/settings/fuelgauge/BatteryMeterView.java b/src/com/android/settings/fuelgauge/BatteryMeterView.java
index 353b3d7ab69..9f1e115a874 100644
--- a/src/com/android/settings/fuelgauge/BatteryMeterView.java
+++ b/src/com/android/settings/fuelgauge/BatteryMeterView.java
@@ -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);
 
diff --git a/src/com/android/settings/fuelgauge/BatterySaverDrawable.java b/src/com/android/settings/fuelgauge/BatterySaverDrawable.java
index 0d3008a0e38..ce2936177ac 100644
--- a/src/com/android/settings/fuelgauge/BatterySaverDrawable.java
+++ b/src/com/android/settings/fuelgauge/BatterySaverDrawable.java
@@ -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));
     }
-}
\ No newline at end of file
+}
diff --git a/src/com/android/settings/widget/DonutView.java b/src/com/android/settings/widget/DonutView.java
index c5ac40bde79..86024bf3cc6 100644
--- a/src/com/android/settings/widget/DonutView.java
+++ b/src/com/android/settings/widget/DonutView.java
@@ -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);
diff --git a/src/com/android/settings/widget/EntityHeaderController.java b/src/com/android/settings/widget/EntityHeaderController.java
index 617e09205c9..272e23c7266 100644
--- a/src/com/android/settings/widget/EntityHeaderController.java
+++ b/src/com/android/settings/widget/EntityHeaderController.java
@@ -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);
diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java
index 843b76ecacb..0d7c851e918 100644
--- a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java
@@ -225,7 +225,7 @@ public class DataUsageSummaryPreferenceTest {
         bindViewHolder();
         assertThat(mCarrierInfo.getVisibility()).isEqualTo(View.VISIBLE);
         assertThat(mCarrierInfo.getCurrentTextColor()).isEqualTo(
-                Utils.getColorAttr(mContext, android.R.attr.textColorSecondary));
+                Utils.getColorAttrDefaultColor(mContext, android.R.attr.textColorSecondary));
         assertThat(mCarrierInfo.getTypeface()).isEqualTo(Typeface.SANS_SERIF);
     }
 
@@ -238,7 +238,7 @@ public class DataUsageSummaryPreferenceTest {
         bindViewHolder();
         assertThat(mCarrierInfo.getVisibility()).isEqualTo(View.VISIBLE);
         assertThat(mCarrierInfo.getCurrentTextColor()).isEqualTo(
-                Utils.getColorAttr(mContext, android.R.attr.colorError));
+                Utils.getColorAttrDefaultColor(mContext, android.R.attr.colorError));
         assertThat(mCarrierInfo.getTypeface()).isEqualTo(
                 DataUsageSummaryPreference.SANS_SERIF_MEDIUM);
     }
@@ -378,7 +378,7 @@ public class DataUsageSummaryPreferenceTest {
         bindViewHolder();
         assertThat(mDataUsed.getText().toString()).isEqualTo("1.00 MB used");
         assertThat(mDataRemaining.getText().toString()).isEqualTo("9.00 MB left");
-        final int colorId = Utils.getColorAttr(mContext, android.R.attr.colorAccent);
+        final int colorId = Utils.getColorAttrDefaultColor(mContext, android.R.attr.colorAccent);
         assertThat(mDataRemaining.getCurrentTextColor()).isEqualTo(colorId);
     }
 
@@ -391,7 +391,7 @@ public class DataUsageSummaryPreferenceTest {
         bindViewHolder();
         assertThat(mDataUsed.getText().toString()).isEqualTo("11.00 MB used");
         assertThat(mDataRemaining.getText().toString()).isEqualTo("1.00 MB over");
-        final int colorId = Utils.getColorAttr(mContext, android.R.attr.colorError);
+        final int colorId = Utils.getColorAttrDefaultColor(mContext, android.R.attr.colorError);
         assertThat(mDataRemaining.getCurrentTextColor()).isEqualTo(colorId);
     }