Refine snap scrolling on the Cards New Tab Page.

chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarPhone.java

Index: chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarPhone.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarPhone.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarPhone.java
index 4d539579922014188c6d820d477203c9e9b1591e..5105c943aa4a6c925b69554abf85770f6f901c1b 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarPhone.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarPhone.java
@@ -878,15 +878,7 @@ public class ToolbarPhone extends ToolbarLayout
         setAncestorsShouldClipChildren(mUrlExpansionPercent == 0f);
         mToolbarShadow.setAlpha(0f);
 
-        float growthPercent = 0f;
-        if (mUrlExpansionPercent == 0f || mUrlExpansionPercent == 1f) {
-            growthPercent = 1f - mUrlExpansionPercent;
-        } else {
-            // During the transition from search box to omnibox, keep the omnibox drawing
-            // at the same size of the search box for first 40% of the scroll transition.
-            growthPercent = mUrlExpansionPercent <= 0.4f
-                    ? 1f : Math.min(1f, (1f - mUrlExpansionPercent) * 1.66667f);
-        }
+        final float growthPercent = Math.min(1f, 1f - mUrlExpansionPercent);

[Bernhard Bauer, 2016/06/28 14:00:17]

|mUrlExpansionPercent| is always going to be between 1 and 0, so you don't need
the extra check.

I'm somewhat worried about doing this even in the pre-cards UI though, because
on its own this will look weird. Should we put that behind the snippets flag? We
could access it through NewTabPage so we wouldn't have to directly check the
flags here.

[PEConn, 2016/06/28 14:32:51]

Done.

 
         int paddingTop = mPhoneLocationBar.getPaddingTop();
         int paddingBottom = mPhoneLocationBar.getPaddingBottom();