[Modern] Decrease tablet NTP fake search box height

BUG=830885

Change-Id: Ie04ce7147d6e89e56d2608c928a49f89681829ef
Reviewed-on: https://chromium-review.googlesource.com/1003223Reviewed-by: Matthew Jones <mdjones@chromium.org>
Commit-Queue: Theresa <twellington@chromium.org>
Cr-Commit-Position: refs/heads/master@{#549284}

chrome/android/java/res/values-sw600dp/dimens.xml

@@ -32,6 +32,7 @@
 
     <!-- NTP dimensions -->
     <dimen name="ntp_logo_height">180dp</dimen>
+    <dimen name="ntp_search_box_height_modern">48dp</dimen>
     <dimen name="ntp_search_box_transition_length">60dp</dimen>
 
     <!-- Recent tabs page -->

chrome/android/java/res/values/dimens.xml

@@ -343,6 +343,7 @@
     <dimen name="ntp_logo_margin_bottom_modern">64dp</dimen>
     <dimen name="ntp_logo_max_internal_space_bottom_modern">8dp</dimen>
     <dimen name="ntp_search_box_height">62dp</dimen>
+    <dimen name="ntp_search_box_height_modern">40dp</dimen>
     <dimen name="ntp_search_box_shadow_width">4dp</dimen>
     <dimen name="ntp_search_box_transition_length">16dp</dimen>
     <dimen name="ntp_search_box_logo_padding">8dp</dimen>

chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageView.java

@@ -287,14 +287,13 @@ public class NewTabPageView
         mSearchBoxView = mNewTabPageLayout.findViewById(R.id.search_box);
         if (SuggestionsConfig.useModernLayout()) {
             mSearchBoxView.setBackgroundResource(R.drawable.modern_toolbar_background);
+            mSearchBoxView.getLayoutParams().height =
+                    getResources().getDimensionPixelSize(R.dimen.ntp_search_box_height_modern);
+
             if (!DeviceFormFactor.isTablet()) {
-                mSearchBoxView.getLayoutParams().height = getResources().getDimensionPixelSize(
-                        R.dimen.modern_toolbar_background_size);
                 mSearchBoxBoundsLateralInset = getResources().getDimensionPixelSize(
                         R.dimen.ntp_search_box_bounds_lateral_inset_modern);
             } else {
-                mSearchBoxView.getLayoutParams().height =
-                        getResources().getDimensionPixelSize(R.dimen.toolbar_height_no_shadow);
                 GradientDrawable background = (GradientDrawable) mSearchBoxView.getBackground();
                 background.setCornerRadius(mSearchBoxView.getLayoutParams().height / 2.f);
             }