Fix a bug Chrome is showing 2 rows of most visited tiles when query tiles are enabled

On small screen device, only 1 row of most visited tile should show when
query tiles are enabled.
However, TileSection hard coded the number of rows to 2. So even though
Chrome reduced most visited tiles to 4, it could still end up showing in
2 rows if the screen can only accommodate 3 tiles in a row.

BUG=1166388

Change-Id: I10dabcd0db1f56fa650ed999a9d353eabbf6ce5c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2630732
Commit-Queue: Min Qin <qinmin@chromium.org>
Reviewed-by: Ted Choc <tedchoc@chromium.org>
Cr-Commit-Position: refs/heads/master@{#844354}

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

@@ -243,7 +243,13 @@ public class NewTabPageLayout extends LinearLayout implements TileGroup.Observer
         mTileGroup = new TileGroup(tileRenderer, mManager, contextMenuManager, tileGroupDelegate,
                 /* observer = */ this, offlinePageBridge);
 
-        mSiteSectionViewHolder = SiteSection.createViewHolder(getSiteSectionView(), mUiConfig);
+        int maxRows = 2;
+        if (searchProviderIsGoogle && QueryTileUtils.isQueryTilesEnabledOnNTP()) {
+            maxRows = QueryTileSection.getMaxRowsForMostVisitedTiles(getContext());
+        }
+
+        mSiteSectionViewHolder =
+                SiteSection.createViewHolder(getSiteSectionView(), mUiConfig, maxRows);
         mSiteSectionViewHolder.bindDataSource(mTileGroup, tileRenderer);
 
         int variation = ExploreSitesBridge.getVariation();
@@ -275,8 +281,7 @@ public class NewTabPageLayout extends LinearLayout implements TileGroup.Observer
                     mSearchBoxCoordinator, profile, mManager::performSearchQuery);
         }
 
-        mTileGroup.startObserving(
-                getMaxRowsForMostVisitedTiles() * getMaxColumnsForMostVisitedTiles());
+        mTileGroup.startObserving(maxRows * getMaxColumnsForMostVisitedTiles());
 
         VrModuleProvider.registerVrModeObserver(this);
         if (VrModuleProvider.getDelegate().isInVr()) onEnterVr();
@@ -801,13 +806,6 @@ public class NewTabPageLayout extends LinearLayout implements TileGroup.Observer
         }
     }
 
-    private int getMaxRowsForMostVisitedTiles() {
-        Integer maxRows = mQueryTileSection == null
-                ? null
-                : mQueryTileSection.getMaxRowsForMostVisitedTiles();
-        return maxRows == null ? 2 : maxRows.intValue();
-    }
-
     /**
      * Determines The maximum number of tiles to try and fit in a row. On smaller screens, there
      * may not be enough space to fit all of them.

chrome/android/java/src/org/chromium/chrome/browser/query_tiles/QueryTileSection.java

@@ -4,6 +4,7 @@
 
 package org.chromium.chrome.browser.query_tiles;
 
+import android.content.Context;
 import android.graphics.Bitmap;
 import android.view.View;
 import android.view.ViewGroup;
@@ -42,6 +43,7 @@ import java.util.List;
  * section.
  */
 public class QueryTileSection {
+    private static final String UMA_PREFIX = "QueryTiles.NTP";
     private static final String MOST_VISITED_MAX_ROWS_SMALL_SCREEN =
             "most_visited_max_rows_small_screen";
     private static final String MOST_VISITED_MAX_ROWS_NORMAL_SCREEN =
@@ -49,7 +51,6 @@ public class QueryTileSection {
     private static final String VARIATION_SMALL_SCREEN_HEIGHT_THRESHOLD_DP =
             "small_screen_height_threshold_dp";
     private static final int DEFAULT_SMALL_SCREEN_HEIGHT_THRESHOLD_DP = 700;
-    private static final String UMA_PREFIX = "QueryTiles.NTP";
 
     private final ViewGroup mQueryTileSectionView;
     private final SearchBoxCoordinator mSearchBoxCoordinator;
@@ -204,12 +205,12 @@ public class QueryTileSection {
     }
 
     /**
+     * @param context Context for display calculation.
      * @return Max number of rows for most visited tiles. For smaller screens, the most visited
      *         tiles section on NTP is shortened so that feed is still visible above the fold.
      */
-    public Integer getMaxRowsForMostVisitedTiles() {
-        DisplayAndroid display =
-                DisplayAndroid.getNonMultiDisplay(mQueryTileSectionView.getContext());
+    public static int getMaxRowsForMostVisitedTiles(Context context) {
+        DisplayAndroid display = DisplayAndroid.getNonMultiDisplay(context);
         int screenHeightDp = DisplayUtil.pxToDp(display, display.getDisplayHeight());
         int smallScreenHeightThresholdDp = ChromeFeatureList.getFieldTrialParamByFeatureAsInt(
                 ChromeFeatureList.QUERY_TILES, VARIATION_SMALL_SCREEN_HEIGHT_THRESHOLD_DP,

chrome/android/java/src/org/chromium/chrome/browser/suggestions/tile/SiteSection.java

@@ -43,19 +43,20 @@ public class SiteSection extends OptionalLeaf implements TileGroup.Observer {
                 .inflate(getLayout(), parent, false);
     }
 
-    public static SiteSectionViewHolder createViewHolder(ViewGroup view, UiConfig uiConfig) {
-        return new TileGridViewHolder(view, getMaxTileRows(), MAX_TILE_COLUMNS);
+    public static SiteSectionViewHolder createViewHolder(
+            ViewGroup view, UiConfig uiConfig, int maxRows) {
+        return new TileGridViewHolder(view, maxRows, MAX_TILE_COLUMNS);
     }
 
     public SiteSection(SuggestionsUiDelegate uiDelegate, ContextMenuManager contextMenuManager,
             TileGroup.Delegate tileGroupDelegate, OfflinePageBridge offlinePageBridge,
-            UiConfig uiConfig) {
+            UiConfig uiConfig, int maxRows) {
         mTileRenderer = new TileRenderer(ContextUtils.getApplicationContext(),
                 SuggestionsConfig.getTileStyle(uiConfig), TILE_TITLE_LINES,
                 uiDelegate.getImageFetcher());
         mTileGroup = new TileGroup(mTileRenderer, uiDelegate, contextMenuManager, tileGroupDelegate,
                 /* observer = */ this, offlinePageBridge);
-        mTileGroup.startObserving(MAX_TILE_COLUMNS * getMaxTileRows());
+        mTileGroup.startObserving(MAX_TILE_COLUMNS * maxRows);
     }
 
     @Override
@@ -108,10 +109,6 @@ public class SiteSection extends OptionalLeaf implements TileGroup.Observer {
         return mTileGroup;
     }
 
-    private static int getMaxTileRows() {
-        return 2;
-    }
-
     @LayoutRes
     private static int getLayout() {
         return R.layout.suggestions_site_tile_grid_modern;

chrome/android/javatests/src/org/chromium/chrome/browser/suggestions/tile/TileGridLayoutTest.java

@@ -132,7 +132,7 @@ public class TileGridLayoutTest {
     @Feature({"NewTabPage", "RenderTest"})
     @ParameterAnnotations.UseMethodParameter(NightModeTestUtils.NightModeParams.class)
     // TODO(https://crbug.com/906151): Add new goldens and enable ExploreSites.
-    @DisableFeatures(ChromeFeatureList.EXPLORE_SITES)
+    @DisableFeatures({ChromeFeatureList.EXPLORE_SITES, ChromeFeatureList.QUERY_TILES})
     public void testTileGridAppearance(boolean nightModeEnabled) throws Exception {
         NewTabPage ntp = setUpFakeDataToShowOnNtp(FAKE_MOST_VISITED_URLS.length);
         mRenderTestRule.render(getTileGridLayout(ntp), "ntp_tile_grid_layout");
@@ -296,7 +296,7 @@ public class TileGridLayoutTest {
             activity.setContentView(contentView);
 
             SiteSectionViewHolder viewHolder = SiteSection.createViewHolder(
-                    SiteSection.inflateSiteSection(contentView), uiConfig);
+                    SiteSection.inflateSiteSection(contentView), uiConfig, 2);
 
             uiConfig.updateDisplayStyle();
 
@@ -345,7 +345,7 @@ public class TileGridLayoutTest {
         };
 
         SiteSection siteSection =
-                new SiteSection(uiDelegate, null, delegate, offlinePageBridge, uiConfig);
+                new SiteSection(uiDelegate, null, delegate, offlinePageBridge, uiConfig, 2);
 
         siteSection.addObserver(new ListObservable.ListObserver<PartialBindCallback>() {
             @Override