NTP, modify the snippet header display to above the peeking card

chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageView.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.ntp;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.Bitmap;
@@ skipping 379 matching lines @@
                 @Override
                 public void onScrollStateChanged(RecyclerView recyclerView, int newState) {
                     if (newState != RecyclerView.SCROLL_STATE_DRAGGING) return;
                     RecordUserAction.record("MobileNTP.Snippets.Scrolled");
                     if (mScrolledOnce) return;
                     mScrolledOnce = true;
                     NewTabPageUma.recordSnippetAction(NewTabPageUma.SNIPPETS_ACTION_SCROLLED);
                 }
             });
             initializeSearchBoxRecyclerViewScrollHandling();
-            mRecyclerView.updateSnippetsHeaderDisplay(mNewTabPageLayout.getPaddingTop());
         } else {
             initializeSearchBoxScrollHandling();
         }
     }
 
     private void updateSearchBoxOnScroll() {
         if (mDisableUrlFocusChangeAnimations) return;
 
         float toolbarTransitionPercentage;
         // During startup the view may not be fully initialized, so we only calculate the current
@@ skipping 65 matching lines @@
 
         mRecyclerView.addOnScrollListener(new RecyclerView.OnScrollListener() {
             @Override
             public void onScrolled(RecyclerView recyclerView, int dx, int dy) {
                 if (mPendingSnapScroll) {
                     mRecyclerView.removeCallbacks(mSnapScrollRunnable);
                     mRecyclerView.postDelayed(mSnapScrollRunnable, SNAP_SCROLL_DELAY_MS);
                 }
                 updateSearchBoxOnScroll();
                 mRecyclerView.updatePeekingCard();
-                mRecyclerView.updateSnippetsHeaderDisplay(mNewTabPageLayout.getPaddingTop());
+                mRecyclerView.updateSnippetsHeaderDisplay();
             }
         });
 
         mRecyclerView.setOnTouchListener(new OnTouchListener() {
             @Override
             @SuppressLint("ClickableViewAccessibility")
             public boolean onTouch(View v, MotionEvent event) {
                 mRecyclerView.removeCallbacks(mSnapScrollRunnable);
 
                 if (event.getActionMasked() == MotionEvent.ACTION_CANCEL
@@ skipping 315 matching lines @@
         int newWidth = right - left;
         if (oldWidth == newWidth) return;
 
         // Re-apply the url focus change amount after a rotation to ensure the views are correctly
         // placed with their new layout configurations.
         onUrlFocusAnimationChanged();
         updateSearchBoxOnScroll();
 
         if (mUseCardsUi) {
             mRecyclerView.updatePeekingCard();
+            mRecyclerView.updateSnippetsHeaderDisplay();
             // The positioning of elements may have been changed (since the elements expand to fill
             // the available vertical space), so adjust the scroll.
             mRecyclerView.snapScroll(mSearchBoxView, getVerticalScroll(), getHeight());
         }
     }
 
     // MostVisitedURLsObserver implementation
 
     @Override
     public void onMostVisitedURLsAvailable(
@@ skipping 248 matching lines @@
 
     @Override
     protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
         if (mNewTabPageLayout != null) {
             mNewTabPageLayout.setParentViewportHeight(MeasureSpec.getSize(heightMeasureSpec));
         }
         super.onMeasure(widthMeasureSpec, heightMeasureSpec);
 
         if (mUseCardsUi) {
             mRecyclerView.updatePeekingCard();
+            mRecyclerView.updateSnippetsHeaderDisplay();
         }
     }
 
     private int getVerticalScroll() {
         if (mUseCardsUi) {
             return mRecyclerView.computeVerticalScrollOffset();
         } else {
             return mScrollView.getScrollY();
         }
     }
 }