From e715f1362aac02bd4ab8df8f3ef44d1bc9660448 Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <ryanvm@gmail.com>
Date: Mon, 27 Oct 2014 15:37:17 -0400
Subject: [PATCH] Backed out changeset 3cd24f004c1a (bug 1068411) for robocop
 NPEs.

---
 .../android/base/resources/drawable/edit_text_default.xml   | 6 ++----
 .../android/base/resources/drawable/edit_text_focused.xml   | 6 ++----
 mobile/android/base/resources/values/search_dimens.xml      | 3 ---
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/mobile/android/base/resources/drawable/edit_text_default.xml b/mobile/android/base/resources/drawable/edit_text_default.xml
index 4fba9c5365a..17b04a26903 100644
--- a/mobile/android/base/resources/drawable/edit_text_default.xml
+++ b/mobile/android/base/resources/drawable/edit_text_default.xml
@@ -10,12 +10,10 @@
         android:right="-2dp"
         android:left="-2dp">
         <shape>
-            <!-- Padding creates vertical space between the text and the underline,
-                 as well as right padding for search icon/clear button -->
+            <!-- Padding creates vertical space between the text and the underline -->
             <padding
                 android:top="@dimen/search_bar_padding_y"
-                android:bottom="@dimen/search_bar_padding_y"
-                android:right="@dimen/search_bar_padding_right"/>
+                android:bottom="@dimen/search_bar_padding_y"/>
             <solid android:color="@android:color/transparent"/>
             <stroke android:width="1dp" android:color="@color/edit_text_default"/>
         </shape>
diff --git a/mobile/android/base/resources/drawable/edit_text_focused.xml b/mobile/android/base/resources/drawable/edit_text_focused.xml
index 38782652e9f..a0e8a6b4ef4 100644
--- a/mobile/android/base/resources/drawable/edit_text_focused.xml
+++ b/mobile/android/base/resources/drawable/edit_text_focused.xml
@@ -10,12 +10,10 @@
         android:right="-3dp"
         android:left="-3dp">
         <shape>
-            <!-- Padding creates vertical space between the text and the underline,
-                 as well as right padding for search icon/clear button -->
+            <!-- Padding creates vertical space between the text and the underline -->
             <padding
                 android:top="@dimen/search_bar_padding_y"
-                android:bottom="@dimen/search_bar_padding_y"
-                android:right="@dimen/search_bar_padding_right"/>
+                android:bottom="@dimen/search_bar_padding_y"/>
             <solid android:color="@android:color/transparent"/>
             <!-- We apply a color filter to set the color for the selected search engine -->
             <stroke android:width="2dp" android:color="@android:color/white"/>
diff --git a/mobile/android/base/resources/values/search_dimens.xml b/mobile/android/base/resources/values/search_dimens.xml
index 166906d5625..1e8ee5c328c 100644
--- a/mobile/android/base/resources/values/search_dimens.xml
+++ b/mobile/android/base/resources/values/search_dimens.xml
@@ -14,9 +14,6 @@
     <dimen name="search_row_padding">15dp</dimen>
     <dimen name="search_bar_padding_y">10dp</dimen>
 
-    <!-- Padding to account for search engine icon/clear button -->
-    <dimen name="search_bar_padding_right">25dp</dimen>
-
     <dimen name="search_history_drawable_padding">10dp</dimen>
 
     <!-- Widget Buttons -->