Use up to 8dp internal space at bottom for logo.

Screenshots: http://shortn/_e12t0VKa6o

Bug: 759134
Change-Id: I448ad8960f3999ee7b95b35fe9d5eadaed7d3015
Reviewed-on: https://chromium-review.googlesource.com/776661
Commit-Queue: Michael van Ouwerkerk <mvanouwerkerk@chromium.org>
Reviewed-by: Bernhard Bauer <bauerb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#517409}

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

@@ -329,6 +329,7 @@
     <dimen name="ntp_logo_margin_top_modern">25dp</dimen>
     <!-- bottom_control_container_height + 8 -->
     <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_shadow_width">4dp</dimen>
     <dimen name="ntp_search_box_transition_length">16dp</dimen>

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

@@ -25,6 +25,7 @@ import android.widget.FrameLayout;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ntp.LogoBridge.Logo;
 import org.chromium.chrome.browser.search_engines.TemplateUrlService;
+import org.chromium.chrome.browser.util.FeatureUtilities;
 import org.chromium.chrome.browser.widget.LoadingView;
 
 import java.lang.ref.WeakReference;
@@ -45,6 +46,9 @@ public class LogoView extends FrameLayout implements OnClickListener {
     // The default logo is shared across all NTPs.
     private static WeakReference<Bitmap> sDefaultLogo;
 
+    // The maximum internal bottom space for when the image is smaller than the view.
+    private final int mLogoMaxInternalSpaceBottom;
+
     // mLogo and mNewLogo are remembered for cross fading animation.
     private Bitmap mLogo;
     private Bitmap mNewLogo;
@@ -104,6 +108,9 @@ public class LogoView extends FrameLayout implements OnClickListener {
     public LogoView(Context context, AttributeSet attrs) {
         super(context, attrs);
 
+        mLogoMaxInternalSpaceBottom = getResources().getDimensionPixelSize(
+                R.dimen.ntp_logo_max_internal_space_bottom_modern);
+
         mLogoMatrix = new Matrix();
         mLogoIsDefault = true;
 
@@ -285,7 +292,14 @@ public class LogoView extends FrameLayout implements OnClickListener {
         if (preventUpscaling) scale = Math.min(1.0f, scale);
 
         int imageOffsetX = Math.round((width - imageWidth * scale) * 0.5f);
-        int imageOffsetY = Math.round((height - imageHeight * scale) * 0.5f);
+
+        final int imageOffsetY;
+        float whitespace = height - imageHeight * scale;
+        if (FeatureUtilities.isChromeHomeEnabled()) {
+            imageOffsetY = Math.max(0, (int) whitespace - mLogoMaxInternalSpaceBottom);
+        } else {
+            imageOffsetY = Math.round(whitespace * 0.5f);
+        }
 
         matrix.setScale(scale, scale);
         matrix.postTranslate(imageOffsetX, imageOffsetY);