Reland [Home] Close the BottomSheet when a URL is loaded on the NTP

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

 // Copyright 2017 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.content.Context;
 import android.support.annotation.CallSuper;
 import android.support.annotation.Nullable;
+import android.text.TextUtils;
 import android.view.View;
 import android.view.View.OnClickListener;
 
 import org.chromium.base.VisibleForTesting;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ChromeTabbedActivity;
 import org.chromium.chrome.browser.NativePage;
 import org.chromium.chrome.browser.UrlConstants;
 import org.chromium.chrome.browser.compositor.layouts.EmptyOverviewModeObserver;
 import org.chromium.chrome.browser.compositor.layouts.LayoutManagerChrome;
 import org.chromium.chrome.browser.compositor.layouts.OverviewModeBehavior.OverviewModeObserver;
 import org.chromium.chrome.browser.tab.EmptyTabObserver;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tab.TabObserver;
 import org.chromium.chrome.browser.tabmodel.TabModelSelector;
 import org.chromium.chrome.browser.widget.bottomsheet.BottomSheet;
 import org.chromium.chrome.browser.widget.bottomsheet.BottomSheetMetrics;
+import org.chromium.content_public.browser.LoadUrlParams;
 
 /**
  * The base class for the new tab pages displayed in Chrome Home.
  */
 public abstract class ChromeHomeNewTabPageBase implements NativePage {
     final Tab mTab;
     final TabObserver mTabObserver;
     final TabModelSelector mTabModelSelector;
     final OverviewModeObserver mOverviewModeObserver;
     @Nullable
@@ skipping 46 matching lines @@
             @Override
             public void onShown(Tab tab) {
                 onNewTabPageShown();
             }
 
             @Override
             public void onHidden(Tab tab) {
                 mFadingBackgroundView.setEnabled(true);
                 if (!mTab.isClosing()) mShowOverviewOnClose = false;
             }
+
+            @Override
+            public void onLoadUrl(Tab tab, LoadUrlParams params, int loadType) {
+                // If the NTP is loading, the sheet state will be set to SHEET_STATE_HALF.
+                if (TextUtils.equals(tab.getUrl(), getUrl())) return;
+
+                mBottomSheet.setSheetState(BottomSheet.SHEET_STATE_PEEK, true);
+            }
         };
         mTab.addObserver(mTabObserver);
 
         // If the tab is already showing TabObserver#onShown() won't be called, so we need to call
         // #onNewTabPageShown() directly.
         boolean tabAlreadyShowing = mTabModelSelector.getCurrentTab() == mTab;
         if (tabAlreadyShowing) onNewTabPageShown();
 
         // TODO(twellington): disallow moving the NTP to the other window in Android N+
         //                    multi-window mode.
@@ skipping 79 matching lines @@
         return ((ChromeTabbedActivity) mTab.getActivity()).getLayoutManager();
     }
 
     // Methods for testing.
 
     @VisibleForTesting
     public View getCloseButtonForTests() {
         return mCloseButton;
     }
 }