[Offline indicator v2] Fix for the NTP

This CL modifies the NTP to work with the status indicator.

When the top controls height changes, the layout's margin will be
updated without any animation.

Bug: 1059438
Change-Id: I06285cda66681fd5af2ecd5abcb972965aa6e9f8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2108182
Commit-Queue: Sinan Sahin <sinansahin@google.com>
Reviewed-by: Theresa  <twellington@chromium.org>
Cr-Commit-Position: refs/heads/master@{#751820}

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

@@ -120,6 +120,8 @@ public class NewTabPage implements NativePage, InvalidationAwareThumbnailProvide
     // Whether destroy() has been called.
     private boolean mIsDestroyed;
 
+    private final int mTabStripAndToolbarHeight;
+
     @Override
     public void onContentOffsetChanged(int offset) {}
 
@@ -135,6 +137,11 @@ public class NewTabPage implements NativePage, InvalidationAwareThumbnailProvide
         updateMargins();
     }
 
+    @Override
+    public void onTopControlsHeightChanged(int topControlsHeight, int topControlsMinHeight) {
+        updateMargins();
+    }
+
     /**
      * Allows clients to listen for updates to the scroll changes of the search box on the
      * NTP.
@@ -349,6 +356,9 @@ public class NewTabPage implements NativePage, InvalidationAwareThumbnailProvide
         DownloadManagerService.getDownloadManagerService().checkForExternallyRemovedDownloads(
                 /*isOffTheRecord=*/false);
 
+        mTabStripAndToolbarHeight =
+                activity.getResources().getDimensionPixelSize(R.dimen.tab_strip_and_toolbar_height);
+
         NewTabPageUma.recordIsUserOnline();
         NewTabPageUma.recordLoadType(activity);
         NewTabPageUma.recordContentSuggestionsDisplayStatus();
@@ -422,6 +432,7 @@ public class NewTabPage implements NativePage, InvalidationAwareThumbnailProvide
 
         layoutParams.bottomMargin = mFullscreenManager.getBottomControlsHeight()
                 - mFullscreenManager.getBottomControlOffset();
+        layoutParams.topMargin = getToolbarExtraYOffset();
 
         view.setLayoutParams(layoutParams);
 
@@ -433,6 +444,16 @@ public class NewTabPage implements NativePage, InvalidationAwareThumbnailProvide
                                 R.dimen.duet_ntp_logo_top_margin));
     }
 
+    // TODO(sinansahin): This is the same as {@link ToolbarManager#getToolbarExtraYOffset}. So, we
+    // should look into sharing the logic.
+    /**
+     * @return The height that is included in the top controls but not in the toolbar or the tab
+     *         strip.
+     */
+    private int getToolbarExtraYOffset() {
+        return mFullscreenManager.getTopControlsHeight() - mTabStripAndToolbarHeight;
+    }
+
     /** @return The view container for the new tab page. */
     @VisibleForTesting
     public NewTabPageView getNewTabPageView() {

chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java

@@ -209,7 +209,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator implements Native
         final ChromeFullscreenManager fullscreenManager = mActivity.getFullscreenManager();
         Supplier<Boolean> canAnimateBrowserControls = () -> {
             final Tab tab = mActivity.getActivityTabProvider().get();
-            return tab != null && tab.isUserInteractable();
+            return tab != null && tab.isUserInteractable() && !tab.isNativePage();
         };
         mToolbarManager.setCanAnimateNativeBrowserControlsSupplier(canAnimateBrowserControls);
         mStatusIndicatorCoordinator = new StatusIndicatorCoordinator(mActivity,