From 6fca98f9051185c0e2cd6811825b84b49bd3d61b Mon Sep 17 00:00:00 2001 From: Jason Monk Date: Wed, 1 Feb 2017 20:20:44 -0500 Subject: [PATCH] Switch references to colorError Test: make Change-Id: I0ed10d78763642cecc5ba8e8e15a097d51280946 --- res/color/storage_wizard_button_red.xml | 4 +-- res/drawable/ic_fingerprint_error.xml | 6 ++-- res/layout/data_usage_chart.xml | 2 +- res/layout/zen_rule_name.xml | 2 +- res/values/colors.xml | 5 --- res/values/styles.xml | 32 +++++++++++++++++-- res/values/themes.xml | 27 ++++------------ .../datausage/ChartDataUsagePreference.java | 7 ++-- .../settings/deviceinfo/StorageSettings.java | 1 - .../deviceinfo/StorageVolumePreference.java | 3 +- 10 files changed, 47 insertions(+), 42 deletions(-) diff --git a/res/color/storage_wizard_button_red.xml b/res/color/storage_wizard_button_red.xml index 9e9a908457e..59de7c76353 100644 --- a/res/color/storage_wizard_button_red.xml +++ b/res/color/storage_wizard_button_red.xml @@ -17,6 +17,6 @@ - + android:color="?android:attr/colorError" /> + diff --git a/res/drawable/ic_fingerprint_error.xml b/res/drawable/ic_fingerprint_error.xml index b822d45d3d6..c9363bcd7b2 100644 --- a/res/drawable/ic_fingerprint_error.xml +++ b/res/drawable/ic_fingerprint_error.xml @@ -19,12 +19,12 @@ android:viewportWidth="32.0" android:viewportHeight="32.0"> diff --git a/res/layout/data_usage_chart.xml b/res/layout/data_usage_chart.xml index 3a2ee098631..4aa0aa8d456 100644 --- a/res/layout/data_usage_chart.xml +++ b/res/layout/data_usage_chart.xml @@ -80,7 +80,7 @@ settings:neighborMargin="5dip" settings:labelSize="60dip" settings:labelTemplate="@string/data_usage_sweep_limit" - settings:labelColor="#fff4511e" + settings:labelColor="?android:attr/colorError" settings:safeRegion="4dp" /> diff --git a/res/layout/zen_rule_name.xml b/res/layout/zen_rule_name.xml index 1112ce22b8b..bdf1f9ffa60 100755 --- a/res/layout/zen_rule_name.xml +++ b/res/layout/zen_rule_name.xml @@ -40,7 +40,7 @@ android:singleLine="true" android:layout_marginLeft="26dp" android:layout_marginRight="26dp" - android:textColor="@color/zen_rule_name_warning" + android:textColor="?android:attr/colorError" android:text="@string/zen_mode_rule_name_warning" /> diff --git a/res/values/colors.xml b/res/values/colors.xml index fdb1265b5fc..6705494ef0f 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -37,18 +37,15 @@ #ff84ffff @color/suw_color_accent_light #fff44336 - @color/lock_pattern_view_error_color #89ffffff #89000000 #00000000 #ff37474f - @*android:color/system_error #ffffff @android:color/white - @*android:color/system_error ?android:attr/colorAccent #ffffffff @@ -75,8 +72,6 @@ #ff384248 - @*android:color/system_error - #ffabffec diff --git a/res/values/styles.xml b/res/values/styles.xml index 790b7264812..269250841d8 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -192,7 +192,7 @@ 12sp viewStart @android:style/TextAppearance.Material.Body1 - @*android:color/system_error + ?android:attr/colorError + + + + + + + + + diff --git a/res/values/themes.xml b/res/values/themes.xml index fe5b3cab367..c961cce7a7c 100644 --- a/res/values/themes.xml +++ b/res/values/themes.xml @@ -40,9 +40,7 @@ @style/PreferenceTheme.SetupWizard - @color/setup_lock_pattern_view_regular_color_dark - @color/setup_lock_pattern_view_success_color_dark - @color/setup_lock_pattern_view_error_color_dark + @style/LockPatternStyle.Setup + diff --git a/src/com/android/settings/datausage/ChartDataUsagePreference.java b/src/com/android/settings/datausage/ChartDataUsagePreference.java index 9f47f7c452d..f72d465e0db 100644 --- a/src/com/android/settings/datausage/ChartDataUsagePreference.java +++ b/src/com/android/settings/datausage/ChartDataUsagePreference.java @@ -50,11 +50,8 @@ public class ChartDataUsagePreference extends Preference { public ChartDataUsagePreference(Context context, AttributeSet attrs) { super(context, attrs); setSelectable(false); - // TODO: Resource. - mLimitColor = 0xfff4511e; - TypedArray a = context.getTheme().obtainStyledAttributes( - new int[]{android.R.attr.textColorSecondary}); - mWarningColor = a.getColor(0, 0); + mLimitColor = Utils.getColorAttr(context, android.R.attr.colorError); + mWarningColor = Utils.getColorAttr(context, android.R.attr.textColorSecondary); setLayoutResource(R.layout.data_usage_graph); } diff --git a/src/com/android/settings/deviceinfo/StorageSettings.java b/src/com/android/settings/deviceinfo/StorageSettings.java index 31bcc4eb13a..c062a56bbd3 100644 --- a/src/com/android/settings/deviceinfo/StorageSettings.java +++ b/src/com/android/settings/deviceinfo/StorageSettings.java @@ -76,7 +76,6 @@ public class StorageSettings extends SettingsPreferenceFragment implements Index private static final String TAG_DISK_INIT = "disk_init"; static final int COLOR_PUBLIC = Color.parseColor("#ff9e9e9e"); - static final int COLOR_WARNING = Color.parseColor("#fff4511e"); static final int[] COLOR_PRIVATE = new int[] { Color.parseColor("#ff26a69a"), diff --git a/src/com/android/settings/deviceinfo/StorageVolumePreference.java b/src/com/android/settings/deviceinfo/StorageVolumePreference.java index 2ef42fa7b33..91bdfbfe964 100644 --- a/src/com/android/settings/deviceinfo/StorageVolumePreference.java +++ b/src/com/android/settings/deviceinfo/StorageVolumePreference.java @@ -32,6 +32,7 @@ import android.widget.ProgressBar; import com.android.settings.R; import com.android.settings.deviceinfo.StorageSettings.UnmountTask; +import com.android.settingslib.Utils; import java.io.File; @@ -83,7 +84,7 @@ public class StorageVolumePreference extends Preference { } if (freeBytes < mStorageManager.getStorageLowBytes(path)) { - mColor = StorageSettings.COLOR_WARNING; + mColor = Utils.getColorAttr(context, android.R.attr.colorError); icon = context.getDrawable(R.drawable.ic_warning_24dp); }