Merge "Update search bar background drawable for dark mode" into qt-dev am: c4083cecd7

am: a3c86b45ee

Change-Id: I187660c76620aa73f882b1d4ed363acefcae7f90

res/drawable/search_bar_selected_background.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+        android:color="?android:attr/colorControlHighlight">
+    <item android:drawable="@color/search_bar_background"/>
+</ripple>

res/layout/search_bar.xml

@@ -28,7 +28,7 @@
         android:layout_width="match_parent"
         android:layout_height="@dimen/search_bar_height"
         android:layout_marginStart="-2dp"
-        android:background="?android:attr/selectableItemBackground"
+        android:background="@drawable/search_bar_selected_background"
         android:contentInsetStartWithNavigation="@dimen/search_bar_content_inset"
         android:navigationIcon="@drawable/ic_homepage_search">
         <TextView

res/values-night/colors.xml

@@ -24,5 +24,6 @@
   <color name="homepage_status_bar_color">#cc000000</color>
   <color name="homepage_card_dismissal_background">@*android:color/material_grey_900</color>
   <color name="contextual_card_background">@*android:color/material_grey_900</color>
+  <color name="search_bar_background">@*android:color/material_grey_800</color>
 </resources>
 

res/values/colors.xml

@@ -140,4 +140,7 @@
     <color name="qr_background_color">#b3ffffff</color> <!-- 70% white transparency -->
     <!-- End of QR code scanner colors -->
 
+    <!-- Search bar background color -->
+    <color name="search_bar_background">@android:color/white</color>
+
 </resources>