Refine snap scrolling on the Cards New Tab Page.

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

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.toolbar;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
@@ skipping 860 matching lines @@
         mNtpSearchBoxScrollPercent = UNINITIALIZED_PERCENT;
         updateUrlExpansionPercent();
     }
 
     private void updateNtpTransitionAnimation(NewTabPage ntp) {
         if (mIsInTabSwitcherMode) return;
 
         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();
 
         ntp.getSearchBoxBounds(mNtpSearchBoxOriginalBounds, mNtpSearchBoxTransformedBounds);
         float halfHeightDifference = (mNtpSearchBoxTransformedBounds.height()
                 - (mPhoneLocationBar.getMeasuredHeight() - paddingTop - paddingBottom
                         + mLocationBarInsets)) / 2f;
         mPhoneLocationBar.setTranslationY(growthPercent == 0f ? 0 : Math.max(0,
                 (mNtpSearchBoxTransformedBounds.top - mPhoneLocationBar.getTop()
@@ skipping 1309 matching lines @@
         });
 
         if (mFullscreenManager != null) {
             mFullscreenCalloutToken =
                     mFullscreenManager.showControlsPersistentAndClearOldToken(
                             mFullscreenCalloutToken);
         }
     }
 }