From 55bd1516517e4ab2f442c70dedbe1681c31f9a69 Mon Sep 17 00:00:00 2001
From: Yorke Lee <yorkelee@google.com>
Date: Thu, 5 Jun 2014 09:33:13 -0700
Subject: Re-enable ripples for viewpager tabs and recents footer

Update focused state and fix ripples for viewpager tab
backgrounds
Fix ripple for recents footer

Bug: 15445528

Change-Id: Iec0e6adf79b60bdcfa98846697e1e44f67cfad16
---
 res/drawable/recent_lists_footer_background.xml | 4 +++-
 res/drawable/view_pager_tab_background.xml      | 7 ++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'res')

diff --git a/res/drawable/recent_lists_footer_background.xml b/res/drawable/recent_lists_footer_background.xml
index 566e353b2..021174a16 100644
--- a/res/drawable/recent_lists_footer_background.xml
+++ b/res/drawable/recent_lists_footer_background.xml
@@ -19,5 +19,7 @@
     android:tint="?android:attr/colorControlHighlight"
     android:pinned="false">
     <!-- Mask to constrain the ripple to the bounds of the view. -->
-    <item android:drawable="@android:color/transparent" />
+    <item android:id="@android:id/mask">
+        <color android:color="@android:color/white" />
+    </item>
 </ripple>
diff --git a/res/drawable/view_pager_tab_background.xml b/res/drawable/view_pager_tab_background.xml
index 7dae671ad..53f891c76 100644
--- a/res/drawable/view_pager_tab_background.xml
+++ b/res/drawable/view_pager_tab_background.xml
@@ -16,10 +16,7 @@
   -->
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
     android:tint="@color/tab_ripple_color">
-    <item>
-        <selector>
-            <item android:state_focused="true"
-                android:drawable="@drawable/tab_unselected_focused" />
-        </selector>
+    <item android:id="@android:id/mask">
+        <color android:color="@android:color/white" />
     </item>
 </ripple>
\ No newline at end of file
-- 
cgit v1.2.3


From a7a7ec2ca96a722f934b2112bb8df71643231bb4 Mon Sep 17 00:00:00 2001
From: Yorke Lee <yorkelee@google.com>
Date: Thu, 5 Jun 2014 10:13:54 -0700
Subject: Set contentInsetStart in activity style

Bug: 15446432
Change-Id: I061f14b06d815cd84a7754aa7d9e2f1c7644e7ae
---
 res/values/styles.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'res')

diff --git a/res/values/styles.xml b/res/values/styles.xml
index 194bc7dbc..5b56dbeb3 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -123,6 +123,7 @@
         <item name="android:height">@dimen/action_bar_height</item>
         <!-- Empty icon -->
         <item name="android:icon">@android:color/transparent</item>
+        <item name="android:contentInsetStart">@dimen/search_margin_horizontal</item>
     </style>
 
     <style name="DialtactsActionBarWithoutTitleStyle" parent="DialtactsActionBarStyle">
-- 
cgit v1.2.3


From 55ca2d148abac55f08e1f30a576aa9d3737db7fa Mon Sep 17 00:00:00 2001
From: Andrew Lee <anwlee@google.com>
Date: Thu, 5 Jun 2014 14:39:51 -0700
Subject: Add searchbox icon tint to the close button.

Bug: 15411375
Change-Id: I9f5857eb1f1edaa1ca91d9b0ce64a90c57edb95a
---
 res/layout/search_edittext.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'res')

diff --git a/res/layout/search_edittext.xml b/res/layout/search_edittext.xml
index ac31ea3b6..a07bfb823 100644
--- a/res/layout/search_edittext.xml
+++ b/res/layout/search_edittext.xml
@@ -82,7 +82,7 @@
         android:layout_height="match_parent"
         android:orientation="horizontal"
         android:gravity="center_vertical"
-        android:visibility="gone">
+        android:visibility="gone" >
 
         <ImageButton
             android:id="@+id/search_back_button"
@@ -113,7 +113,8 @@
             android:src="@drawable/ic_close_dk"
             android:clickable="true"
             android:background="?android:attr/selectableItemBackground"
-            android:contentDescription="@string/description_clear_search" />
+            android:contentDescription="@string/description_clear_search"
+            android:tint="@color/searchbox_icon_tint" />
 
     </LinearLayout>
 
-- 
cgit v1.2.3