From 9ad817d503db9174ed102cca5e5dac6f0f520b61 Mon Sep 17 00:00:00 2001
From: pastychang <pastychang@google.com>
Date: Mon, 1 Jul 2019 19:06:25 +0800
Subject: [PATCH] Remove attribute colorError from settings glif theme

The attribute colorError has set in glif theme of setupdesign library. Remove it from
settings glif theme to avoid it overriden.

Bug: 128399555
Test: Manual
Change-Id: I08aa1053a6eb21b014246dcd116d7b2f4b7413e1
---
 res/values/colors.xml     | 2 --
 res/values/themes_suw.xml | 3 ---
 2 files changed, 5 deletions(-)

diff --git a/res/values/colors.xml b/res/values/colors.xml
index 7114bb15152..a1cb8fcadff 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -108,8 +108,6 @@
     <color name="switchbar_switch_track_tint">#BFFFFFFF</color>
     <color name="switchbar_switch_thumb_tint">@android:color/white</color>
 
-    <color name="glif_error_color">@*android:color/material_red_A700</color>
-
     <color name="battery_good_color_light">#43a047</color> <!-- Material Green 600 -->
     <color name="battery_maybe_color_light">#ef6c00</color> <!-- Material Orange 800 -->
     <color name="battery_bad_color_light">#f44336</color> <!-- Material Red 500 -->
diff --git a/res/values/themes_suw.xml b/res/values/themes_suw.xml
index f7f1d16bb8b..3c171a1316b 100644
--- a/res/values/themes_suw.xml
+++ b/res/values/themes_suw.xml
@@ -52,7 +52,6 @@
         <item name="preferenceTheme">@style/PreferenceTheme.SetupWizard</item>
 
         <item name="*android:lockPatternStyle">@style/LockPatternStyle.Setup</item>
-        <item name="*android:colorError">@color/glif_error_color</item>
     </style>
 
     <style name="GlifV2Theme" parent="SudThemeGlifV2.DayNight">
@@ -90,7 +89,6 @@
         <item name="preferenceTheme">@style/PreferenceTheme.SetupWizard</item>
 
         <item name="*android:lockPatternStyle">@style/LockPatternStyle.Setup</item>
-        <item name="*android:colorError">@color/glif_error_color</item>
     </style>
 
     <style name="GlifV3Theme" parent="SudThemeGlifV3.DayNight">
@@ -133,7 +131,6 @@
         <item name="preferenceTheme">@style/PreferenceTheme.SetupWizard</item>
 
         <item name="*android:lockPatternStyle">@style/LockPatternStyle.Setup</item>
-        <item name="*android:colorError">@color/glif_error_color</item>
     </style>
 
     <style name="GlifV2Theme.Transparent">