From 3079af1d365ba8d6addb823004ed7987bc94ef09 Mon Sep 17 00:00:00 2001
From: Jeff Boek <jeff@jeffboek.com>
Date: Mon, 28 Jan 2019 15:26:37 -0800
Subject: [PATCH] Adds search engine icon to searchbar

---
 .../java/org/mozilla/fenix/home/HomeFragment.kt   | 15 +++++++++++++--
 .../main/res/drawable/home_search_background.xml  |  5 -----
 app/src/main/res/layout/fragment_home.xml         |  9 ++++++---
 3 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
index f09e4c58f..1b6026ad5 100644
--- a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
@@ -4,6 +4,8 @@
 
 package org.mozilla.fenix.home
 
+import android.content.res.Resources
+import android.graphics.drawable.BitmapDrawable
 import android.os.Bundle
 import android.transition.TransitionInflater
 import android.view.LayoutInflater
@@ -18,6 +20,9 @@ import org.mozilla.fenix.R
 import org.mozilla.fenix.home.sessions.SessionsComponent
 import org.mozilla.fenix.home.sessions.layoutComponents
 import org.mozilla.fenix.mvi.ActionBusFactory
+import org.mozilla.fenix.ext.requireComponents
+import kotlin.math.roundToInt
+
 
 class HomeFragment : Fragment() {
     override fun onCreateView(
@@ -31,10 +36,16 @@ class HomeFragment : Fragment() {
         super.onViewCreated(view, savedInstanceState)
 
         // Hide buttons that aren't used yet to prevent confusion
-        menuButton.visibility = View.GONE
-        privateBrowsingButton.visibility = View.GONE
+//        menuButton.visibility = View.GONE
+//        privateBrowsingButton.visibility = View.GONE
+
+        val searchIcon = requireComponents.search.searchEngineManager.getDefaultSearchEngine(requireContext()).let {
+            BitmapDrawable(resources, it.icon)
+        }
 
         toolbar_wrapper.clipToOutline = false
+        toolbar.setCompoundDrawablesWithIntrinsicBounds(searchIcon, null, null, null)
+        toolbar.compoundDrawablePadding = (12f * Resources.getSystem().displayMetrics.density).roundToInt()
         toolbar.setOnClickListener { it ->
             val extras = FragmentNavigator.Extras.Builder().addSharedElement(
                 toolbar, ViewCompat.getTransitionName(toolbar)!!
diff --git a/app/src/main/res/drawable/home_search_background.xml b/app/src/main/res/drawable/home_search_background.xml
index 5dd042871..24c988c6f 100644
--- a/app/src/main/res/drawable/home_search_background.xml
+++ b/app/src/main/res/drawable/home_search_background.xml
@@ -8,11 +8,6 @@
     <stroke android:width="1dp"
             android:color="@color/searchStroke"/>
 
-    <padding android:left="2dp"
-             android:top="2dp"
-             android:right="2dp"
-             android:bottom="2dp"/>
-
     <corners android:bottomRightRadius="8dp"
              android:bottomLeftRadius="8dp"
              android:topLeftRadius="8dp"
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 086171143..2d28f2f47 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -59,9 +59,12 @@
         <TextView
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
-            android:layout_height="40dp"
-            android:layout_margin="8dp"
-            android:background="@android:color/white"
+            android:layout_height="wrap_content"
+            android:paddingStart="12sp"
+            android:paddingEnd="12sp"
+            android:paddingTop="16sp"
+            android:paddingBottom="16sp"
+            android:drawablePadding="12sp"
             android:clickable="true"
             android:focusable="true"
             android:gravity="center_vertical"