From a2731e24a69bdc93fa4f31861b701874d9226d3e Mon Sep 17 00:00:00 2001
From: Jan Nordqvist <jannq@google.com>
Date: Thu, 5 Apr 2018 09:30:43 -0700
Subject: [PATCH] Change "X over" text color to ColorError

Bug: 70950124

Test: manual
Test: make RunSettingsRoboTests
Change-Id: I2a59d6b4b4549a780ae168e9e1b3f356c677262c
---
 res/layout/data_usage_summary_preference.xml                  | 3 +--
 .../settings/datausage/DataUsageSummaryPreference.java        | 4 ++++
 .../settings/datausage/DataUsageSummaryPreferenceTest.java    | 4 ++++
 3 files changed, 9 insertions(+), 2 deletions(-)

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" />
 
     </LinearLayout>
 
diff --git a/src/com/android/settings/datausage/DataUsageSummaryPreference.java b/src/com/android/settings/datausage/DataUsageSummaryPreference.java
index 6b00a6891a3..09f706b66d7 100644
--- a/src/com/android/settings/datausage/DataUsageSummaryPreference.java
+++ b/src/com/android/settings/datausage/DataUsageSummaryPreference.java
@@ -196,10 +196,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 eee961de569..5f39dc4f73d 100644
--- a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java
@@ -356,6 +356,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
@@ -367,6 +369,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