From a632d8f1dc57b15c8f1ed29bc7d14fbbd1f35fdf Mon Sep 17 00:00:00 2001
From: Tiger Oakes <toakes@mozilla.com>
Date: Mon, 19 Aug 2019 19:22:51 -0400
Subject: [PATCH] For #4744 - Move search bar icon padding to dimens (#4814)

---
 app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt | 5 +----
 app/src/main/res/values/dimens.xml                       | 3 ++-
 2 files changed, 3 insertions(+), 5 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 994237eba..b85e4cbab 100644
--- a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
@@ -7,7 +7,6 @@ package org.mozilla.fenix.home
 import android.animation.Animator
 import android.content.Context
 import android.content.DialogInterface
-import android.content.res.Resources
 import android.graphics.drawable.BitmapDrawable
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -84,7 +83,6 @@ import org.mozilla.fenix.onboarding.FenixOnboarding
 import org.mozilla.fenix.settings.SupportUtils
 import org.mozilla.fenix.share.ShareTab
 import org.mozilla.fenix.utils.allowUndo
-import kotlin.math.roundToInt
 
 @SuppressWarnings("TooManyFunctions", "LargeClass")
 class HomeFragment : Fragment(), AccountObserver {
@@ -241,7 +239,7 @@ class HomeFragment : Fragment(), AccountObserver {
             )
         }
         view.toolbar.compoundDrawablePadding =
-            (toolbarPaddingDp * Resources.getSystem().displayMetrics.density).roundToInt()
+            view.resources.getDimensionPixelSize(R.dimen.search_bar_search_engine_icon_padding)
         view.toolbar_wrapper.setOnClickListener {
             invokePendingDeleteJobs()
             onboarding.finish()
@@ -874,7 +872,6 @@ class HomeFragment : Fragment(), AccountObserver {
         private const val TELEMETRY_HOME_IDENITIFIER = "home"
         private const val SHARED_TRANSITION_MS = 200L
         private const val TAB_ITEM_TRANSITION_NAME = "tab_item"
-        private const val toolbarPaddingDp = 12f
     }
 }
 
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index b83f42e21..aa9233787 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -18,6 +18,7 @@
     <dimen name="tab_border_width">2dp</dimen>
     <dimen name="tab_corner_radius">8dp</dimen>
     <dimen name="preference_icon_drawable_size">24dp</dimen>
+    <dimen name="search_bar_search_engine_icon_padding">12dp</dimen>
     <dimen name="search_engine_radio_button_height">48dp</dimen>
     <dimen name="radio_button_drawable_padding">32dp</dimen>
     <dimen name="radio_button_padding_horizontal">16dp</dimen>
@@ -50,4 +51,4 @@
     <dimen name="sign_in_button_padding">10dp</dimen>
     <dimen name="sign_in_button_margin_top">32dp</dimen>
     <dimen name="sign_in_button_margin">16dp</dimen>
-</resources>
\ No newline at end of file
+</resources>