diff --git a/res/layout/data_usage_summary_preference.xml b/res/layout/data_usage_summary_preference.xml index bd13d80bc42..1432c726ee1 100644 --- a/res/layout/data_usage_summary_preference.xml +++ b/res/layout/data_usage_summary_preference.xml @@ -59,8 +59,7 @@ android:layout_height="wrap_content" android:fontFamily="@*android:string/config_headlineFontFamily" android:textAppearance="?android:attr/textAppearanceMedium" - android:textSize="16sp" - android:textColor="?android:attr/colorAccent" /> + android:textSize="16sp" /> diff --git a/src/com/android/settings/datausage/DataUsageSummaryPreference.java b/src/com/android/settings/datausage/DataUsageSummaryPreference.java index 6473ca7adc3..3faa433d885 100644 --- a/src/com/android/settings/datausage/DataUsageSummaryPreference.java +++ b/src/com/android/settings/datausage/DataUsageSummaryPreference.java @@ -234,10 +234,14 @@ public class DataUsageSummaryPreference extends Preference { usageRemainingField.setText( TextUtils.expandTemplate(getContext().getText(R.string.data_remaining), Formatter.formatFileSize(getContext(), dataRemaining))); + usageRemainingField.setTextColor( + Utils.getColorAttr(getContext(), android.R.attr.colorAccent)); } else { usageRemainingField.setText( TextUtils.expandTemplate(getContext().getText(R.string.data_overusage), Formatter.formatFileSize(getContext(), -dataRemaining))); + usageRemainingField.setTextColor( + Utils.getColorAttr(getContext(), android.R.attr.colorError)); } } } diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java index 6bc76cf00d1..7a14ea02290 100644 --- a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java @@ -369,6 +369,8 @@ 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); + assertThat(mDataRemaining.getCurrentTextColor()).isEqualTo(colorId); } @Test @@ -380,6 +382,8 @@ 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); + assertThat(mDataRemaining.getCurrentTextColor()).isEqualTo(colorId); } @Test