From e75ea2c646d2b53cf24da0ae0b25d0a798e9470d Mon Sep 17 00:00:00 2001
From: Patryk Michalik <contact@patrykmichalik.com>
Date: Mon, 11 Oct 2021 18:06:44 +0200
Subject: [PATCH] Refine Dock search bar

---
 lawnchair/res/drawable/pill_ripple.xml            |  9 +++++++++
 lawnchair/res/layout/search_container_hotseat.xml | 12 ++++++------
 lawnchair/res/values/dimens.xml                   |  5 ++---
 3 files changed, 17 insertions(+), 9 deletions(-)
 create mode 100644 lawnchair/res/drawable/pill_ripple.xml

diff --git a/lawnchair/res/drawable/pill_ripple.xml b/lawnchair/res/drawable/pill_ripple.xml
new file mode 100644
index 0000000000..50afe2fbae
--- /dev/null
+++ b/lawnchair/res/drawable/pill_ripple.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android" android:color="?android:colorControlHighlight">
+    <item android:id="@android:id/mask">
+        <shape android:shape="rectangle">
+            <solid android:color="#000"/>
+            <corners android:radius="1000dp" />
+        </shape>
+    </item>
+</ripple>
\ No newline at end of file
diff --git a/lawnchair/res/layout/search_container_hotseat.xml b/lawnchair/res/layout/search_container_hotseat.xml
index 9bb1199b11..e230dd171e 100644
--- a/lawnchair/res/layout/search_container_hotseat.xml
+++ b/lawnchair/res/layout/search_container_hotseat.xml
@@ -21,25 +21,25 @@
         android:layout_width="wrap_content"
         android:layout_height="fill_parent"
         android:layout_gravity="end|center"
-        android:layout_marginTop="-6.0dip"
-        android:layout_marginBottom="-6.0dip"
+        android:layout_marginTop="6.0dp"
+        android:layout_marginBottom="6.0dp"
         android:orientation="horizontal">
 
         <app.lawnchair.qsb.AssistantIconView
             android:id="@+id/mic_icon"
-            android:layout_width="@dimen/qsb_mic_width"
+            android:layout_width="@dimen/qsb_content_height"
             android:layout_height="fill_parent"
-            android:background="?android:selectableItemBackgroundBorderless"
+            android:background="@drawable/pill_ripple"
             android:clickable="true"
             android:contentDescription="@string/label_voice_search"
             android:focusable="false" />
 
         <ImageButton
             android:id="@+id/lens_icon"
-            android:layout_width="@dimen/qsb_lens_width"
+            android:layout_width="@dimen/qsb_content_height"
             android:layout_height="fill_parent"
             android:layout_marginEnd="@dimen/qsb_lens_marginEnd"
-            android:background="?android:selectableItemBackgroundBorderless"
+            android:background="@drawable/pill_ripple"
             android:clickable="true"
             android:contentDescription="@string/label_lens"
             android:focusable="false"
diff --git a/lawnchair/res/values/dimens.xml b/lawnchair/res/values/dimens.xml
index 9fb461fc16..6db7dc63e8 100644
--- a/lawnchair/res/values/dimens.xml
+++ b/lawnchair/res/values/dimens.xml
@@ -36,12 +36,11 @@
     <dimen name="qsb_g_icon_marginStart">16dp</dimen>
     <dimen name="qsb_lens_marginEnd">4dp</dimen>
     <dimen name="qsb_lens_padding">8dp</dimen>
-    <dimen name="qsb_lens_width">48dp</dimen>
     <dimen name="qsb_margin_top_adjusting">20dp</dimen>
-    <dimen name="qsb_mic_width">54dp</dimen>
     <dimen name="qsb_min_width_with_mic">124dp</dimen>
     <dimen name="qsb_shadow_margin">6dp</dimen>
-    <dimen name="qsb_widget_height">63dp</dimen>
+    <dimen name="qsb_widget_height">64dp</dimen>
+    <dimen name="qsb_content_height">52dp</dimen>
 
     <dimen name="search_box_container_height">60dp</dimen>
     <dimen name="search_box_height">52dp</dimen>