From 612c5dfb1ff9d3f1c23cb4a7b30b71655394a9d6 Mon Sep 17 00:00:00 2001
From: Andrew Lee <anwlee@google.com>
Date: Fri, 30 May 2014 14:21:33 -0700
Subject: Updated colors and indent for search box according to redlines.

Bug: 15345202
Change-Id: I2dc697d2918c5e4b0b2c3a61b27c524c54dd8d84
---
 res/layout/search_edittext.xml | 9 ++++++---
 res/values/colors.xml          | 4 ++--
 res/values/dimens.xml          | 2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)

(limited to 'res')

diff --git a/res/layout/search_edittext.xml b/res/layout/search_edittext.xml
index 193222888..50cbf5af9 100644
--- a/res/layout/search_edittext.xml
+++ b/res/layout/search_edittext.xml
@@ -36,7 +36,8 @@
                 android:layout_margin="@dimen/search_box_icon_margin"
                 android:padding="@dimen/search_box_search_icon_padding"
                 android:src="@drawable/ic_ab_search"
-                android:importantForAccessibility="no" />
+                android:importantForAccessibility="no"
+                android:tint="@color/searchbox_icon_tint" />
 
             <TextView
                 android:layout_width="wrap_content"
@@ -59,7 +60,9 @@
             android:src="@drawable/ic_voice_search"
             android:clickable="true"
             android:contentDescription="@string/description_start_voice_search"
-            android:background="?android:attr/selectableItemBackground" />
+            android:background="?android:attr/selectableItemBackground"
+            android:tint="@color/searchbox_icon_tint" />
+
 
         <ImageButton
             android:id="@+id/dialtacts_options_menu_button"
@@ -69,7 +72,7 @@
             android:background="?android:attr/selectableItemBackground"
             android:src="@drawable/ic_overflow_menu"
             android:contentDescription="@string/action_menu_overflow_description"
-            android:tint="@color/searchbox_options_menu_color" />
+            android:tint="@color/searchbox_icon_tint" />
 
     </LinearLayout>
 
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 8bba479c7..42d91189b 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -61,8 +61,8 @@
     <!-- Text color of the search box text as entered by user  -->
     <color name="searchbox_text_color">#000000</color>
     <!-- Text color of the search box hint text  -->
-    <color name="searchbox_hint_text_color">#d3d3d3</color>
-    <color name="searchbox_options_menu_color">#d5d5d5</color>
+    <color name="searchbox_hint_text_color">#a4a4a4</color>
+    <color name="searchbox_icon_tint">#a4a4a4</color>
 
     <!-- Color of the contact name in favorite tiles -->
     <color name="contact_tile_name_color">#ffffff</color>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 7318d92e8..4c86509c5 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -114,7 +114,7 @@
     <dimen name="search_box_icon_margin">4dp</dimen>
     <dimen name="search_box_search_icon_padding">4dp</dimen>
     <!-- Left margin of the text field in the search box. -->
-    <dimen name="search_box_text_left_margin">8dp</dimen>
+    <dimen name="search_box_text_left_margin">27dp</dimen>
     <!-- Size of the icon (voice search, close search) in the search box. -->
     <dimen name="search_box_icon_size">28dp</dimen>
     <!-- Elevation of the search box -->
-- 
cgit v1.2.3