From e22d7c2b358d9c0f362627d3194b051719f2ba5c Mon Sep 17 00:00:00 2001
From: Maurice Lam <yukl@google.com>
Date: Fri, 15 Dec 2017 17:03:23 -0800
Subject: Change accent color in GLIF V3

Change the accent color to Google Blue 600 for better contrast. The
button color change in ag/3301076 was mostly reverted because the
color will be automatically picked up from the updated accent color.

Test: Manual, Existing tests pass
Bug: 69930196
Change-Id: I2fad5b029357afec9402ef8de5810fa0e092a713
---
 library/main/res/color-v23/suw_flat_button_highlight.xml |  2 +-
 library/main/res/values/attrs.xml                        |  1 -
 library/main/res/values/colors.xml                       |  4 ++--
 library/main/res/values/styles.xml                       | 12 ++----------
 4 files changed, 5 insertions(+), 14 deletions(-)

(limited to 'library/main/res')

diff --git a/library/main/res/color-v23/suw_flat_button_highlight.xml b/library/main/res/color-v23/suw_flat_button_highlight.xml
index 4d90570..c5be14f 100644
--- a/library/main/res/color-v23/suw_flat_button_highlight.xml
+++ b/library/main/res/color-v23/suw_flat_button_highlight.xml
@@ -16,6 +16,6 @@
 -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="?attr/suwButtonColor"
+    <item android:color="?android:attr/colorAccent"
         android:alpha="0.24" />
 </selector>
diff --git a/library/main/res/values/attrs.xml b/library/main/res/values/attrs.xml
index 7820a6d..ffdf365 100644
--- a/library/main/res/values/attrs.xml
+++ b/library/main/res/values/attrs.xml
@@ -20,7 +20,6 @@
     <!-- Theme attributes -->
     <attr name="suwLayoutTheme" format="reference" />
     <attr name="suwMarginSides" format="dimension|reference" />
-    <attr name="suwButtonColor" format="color" />
     <attr name="suwEditTextBackgroundColor" format="color" />
 
     <!-- Subset of values in "gravity" in frameworks/base/core/res/res/values/attrs.xml. Only
diff --git a/library/main/res/values/colors.xml b/library/main/res/values/colors.xml
index b653c98..e919f4b 100644
--- a/library/main/res/values/colors.xml
+++ b/library/main/res/values/colors.xml
@@ -42,9 +42,9 @@
     <!-- GLIF colors -->
     <color name="suw_color_accent_glif_dark">#ff4285f4</color>
     <color name="suw_color_accent_glif_light">#ff4285f4</color>
+    <color name="suw_color_accent_glif_v3">#ff1a73e8</color>
     <color name="suw_glif_background_color_dark">#ff000000</color>
     <color name="suw_glif_background_color_light">#ffffffff</color>
-    <color name="suw_glif_v3_footer_button_color">#ff1a73e8</color>
-    <color name="suw_glif_edittext_bg_light_color">#F1F3F4</color>
+    <color name="suw_glif_edit_text_bg_light_color">#fff1f3f4</color>
 
 </resources>
diff --git a/library/main/res/values/styles.xml b/library/main/res/values/styles.xml
index 1d7d28b..022efe4 100644
--- a/library/main/res/values/styles.xml
+++ b/library/main/res/values/styles.xml
@@ -30,7 +30,7 @@
         <item name="suwDividerInsetStartNoIcon">?attr/suwMarginSides</item>
         <item name="suwGlifHeaderGravity">center_horizontal</item>
         <item name="suwScrollIndicators">top|bottom</item>
-        <item name="suwEditTextBackgroundColor">@color/suw_glif_edittext_bg_light_color</item> <!-- TODO: Change color -->
+        <item name="suwEditTextBackgroundColor">@color/suw_glif_edit_text_bg_light_color</item> <!-- TODO: Change color -->
         <item name="android:editTextStyle">@style/SuwEditText</item>
     </style>
 
@@ -45,18 +45,10 @@
         <item name="suwDividerInsetStartNoIcon">?attr/suwMarginSides</item>
         <item name="suwGlifHeaderGravity">center_horizontal</item>
         <item name="suwScrollIndicators">top|bottom</item>
-        <item name="suwEditTextBackgroundColor">@color/suw_glif_edittext_bg_light_color</item>
+        <item name="suwEditTextBackgroundColor">@color/suw_glif_edit_text_bg_light_color</item>
         <item name="android:editTextStyle">@style/SuwEditText</item>
     </style>
 
-    <style name="SuwThemeGlifV3" parent="SuwThemeGlifV2">
-        <item name="suwButtonColor">@color/suw_glif_v3_footer_button_color</item>
-    </style>
-
-    <style name="SuwThemeGlifV3.Light" parent="SuwThemeGlifV2.Light">
-        <item name="suwButtonColor">@color/suw_glif_v3_footer_button_color</item>
-    </style>
-
     <style name="Animation.SuwWindowAnimation" parent="@android:style/Animation.Activity">
         <item name="android:activityOpenEnterAnimation">@anim/suw_slide_next_in</item>
         <item name="android:activityOpenExitAnimation">@anim/suw_slide_next_out</item>
-- 
cgit v1.2.3