From 3598f6b222ba8bbcb26991631d31462d66af5b1a Mon Sep 17 00:00:00 2001
From: pedrosimonetti <pedrosimonetti@chromium.org>
Date: Tue, 8 Sep 2015 11:36:09 -0700
Subject: [PATCH] [Contextual Search] Adjust spacing according to spec

BUG=528332

Review URL: https://codereview.chromium.org/1308163008

Cr-Commit-Position: refs/heads/master@{#347747}
---
 .../java/res/layout/contextual_search_context_view.xml     | 2 ++
 chrome/android/java/res/values-v17/styles.xml              | 7 +++----
 .../contextualsearch/ContextualSearchPanelBase.java        | 2 +-
 .../android/compositor/layer/contextual_search_layer.cc    | 7 ++++---
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/chrome/android/java/res/layout/contextual_search_context_view.xml b/chrome/android/java/res/layout/contextual_search_context_view.xml
index 7c840db0a33cb8..6027c48e564a1a 100644
--- a/chrome/android/java/res/layout/contextual_search_context_view.xml
+++ b/chrome/android/java/res/layout/contextual_search_context_view.xml
@@ -19,6 +19,8 @@
         android:id="@+id/selected_text"
         style="@style/ContextualSearchTextView"
         android:layout_width="wrap_content"
+        android:layout_marginStart="5dp"
+        android:layout_marginEnd="5dp"
         android:gravity="center_horizontal" />
     <TextView
         android:id="@+id/surrounding_text_end"
diff --git a/chrome/android/java/res/values-v17/styles.xml b/chrome/android/java/res/values-v17/styles.xml
index a0b9e28da7f775..03afa1a03dd9fe 100644
--- a/chrome/android/java/res/values-v17/styles.xml
+++ b/chrome/android/java/res/values-v17/styles.xml
@@ -366,14 +366,13 @@
         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_gravity">bottom</item>
         <item name="android:background">#FFF</item>
-        <item name="android:paddingStart">40dp</item>
-        <item name="android:paddingEnd">40dp</item>
         <item name="android:visibility">invisible</item>
+        <!-- 60dp padding minus 7dp for fading edge -->
+        <item name="android:paddingStart">53dp</item>
+        <item name="android:paddingEnd">53dp</item>
     </style>
     <style name="ContextualSearchTextView">
         <item name="android:layout_height">match_parent</item>
-        <item name="android:layout_marginStart">5dp</item>
-        <item name="android:layout_marginEnd">5dp</item>
         <item name="android:ellipsize">end</item>
         <item name="android:singleLine">true</item>
         <item name="android:textColor">#000</item>
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchPanelBase.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchPanelBase.java
index 0b55d69bfaee89..d08874dbf6936e 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchPanelBase.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchPanelBase.java
@@ -31,7 +31,7 @@ abstract class ContextualSearchPanelBase extends ContextualSearchPanelStateHandl
     /**
      * The side padding of Search Bar icons in dps.
      */
-    private static final float SEARCH_BAR_ICON_SIDE_PADDING_DP = 16.f;
+    private static final float SEARCH_BAR_ICON_SIDE_PADDING_DP = 12.f;
 
     /**
      * The height of the Search Bar's border in dps.
diff --git a/chrome/browser/android/compositor/layer/contextual_search_layer.cc b/chrome/browser/android/compositor/layer/contextual_search_layer.cc
index 19277e93c43612..15f2b6f977cdf5 100644
--- a/chrome/browser/android/compositor/layer/contextual_search_layer.cc
+++ b/chrome/browser/android/compositor/layer/contextual_search_layer.cc
@@ -148,19 +148,20 @@ void ContextualSearchLayer::SetProperties(
   // ---------------------------------------------------------------------------
   // Search Provider Icon
   // ---------------------------------------------------------------------------
-  float search_provider_icon_left;
-  float search_provider_icon_top;
   // Positions the Search Provider Icon at the start of the Search Bar.
+  float search_provider_icon_left;
   if (is_rtl) {
     search_provider_icon_left = search_panel_width -
         search_provider_icon_resource->size.width() - search_bar_margin_side;
   } else {
     search_provider_icon_left = search_bar_margin_side;
   }
+
   // Centers the Search Provider Icon vertically in the Search Bar.
-  search_provider_icon_top =
+  float search_provider_icon_top =
       search_bar_height / 2 -
       search_provider_icon_resource->size.height() / 2;
+
   search_provider_icon_->SetUIResourceId(
       search_provider_icon_resource->ui_resource->id());
   search_provider_icon_->SetBounds(search_provider_icon_resource->size);