Add feature for condensed NTP tiles.

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.Configuration;
 import android.graphics.Canvas;
@@ skipping 58 matching lines @@
      * Experiment parameter for the maximum number of tile suggestion rows to show.
      */
     private static final String PARAM_NTP_MAX_TILE_ROWS = "ntp_max_tile_rows";
 
     /**
      * Experiment parameter for the number of tile title lines to show.
      */
     private static final String PARAM_NTP_TILE_TITLE_LINES = "ntp_tile_title_lines";
 
     /**
-     * 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.
+     * Experiment parameter for whether to use the condensed tile layout on small screens.
      */
-    private static final int MAX_TILE_COLUMNS = 4;
+    private static final String PARAM_NTP_CONDENSED_TILE_LAYOUT_FOR_SMALL_SCREENS_ENABLED =
+            "ntp_condensed_tile_layout_for_small_screens_enabled";

[Alexei Svitkine (slow), 2017/02/27 15:56:27]

Nit: This param name is awfully long. Can you find a shorter name?

e.g.

condensed_layout_for_small_screens
condensed_layout_for_large_screens

[Michael van Ouwerkerk, 2017/02/27 16:53:57]

Done. We can do without the "ntp" part if you prefer, but the "tile" part helps
distinguish it from a related experiment that we want to control separately.

+
+    /**
+     * Experiment parameter for whether to use the condensed tile layout on large screens.
+     */
+    private static final String PARAM_NTP_CONDENSED_TILE_LAYOUT_FOR_LARGE_SCREENS_ENABLED =
+            "ntp_condensed_tile_layout_for_large_screens_enabled";
 
     private NewTabPageRecyclerView mRecyclerView;
 
     private NewTabPageLayout mNewTabPageLayout;
     private LogoView mSearchProviderLogoView;
     private View mSearchBoxView;
     private ImageView mVoiceSearchButton;
     private TileGridLayout mTileGridLayout;
     private View mTileGridPlaceholder;
     private View mNoSearchLogoSpacer;
@@ skipping 134 matching lines @@
             public void onDestroy() {
                 mActivity.getWindowAndroid().removeContextMenuCloseListener(mContextMenuManager);
             }
         });
 
         OfflinePageBridge offlinePageBridge =
                 OfflinePageBridge.getForProfile(Profile.getLastUsedProfile());
 
         mTileGridLayout = (TileGridLayout) mNewTabPageLayout.findViewById(R.id.tile_grid_layout);
         mTileGridLayout.setMaxRows(getMaxTileRows(searchProviderHasLogo));
+        mTileGridLayout.setMaxColumns(getMaxTileColumns());
         mTileGroup = new TileGroup(mActivity, mManager, mContextMenuManager, mTileGroupDelegate,
                 /* observer = */ this, offlinePageBridge, getTileTitleLines());
 
         mSearchProviderLogoView =
                 (LogoView) mNewTabPageLayout.findViewById(R.id.search_provider_logo);
         mSearchBoxView = mNewTabPageLayout.findViewById(R.id.search_box);
         mNoSearchLogoSpacer = mNewTabPageLayout.findViewById(R.id.no_search_logo_spacer);
 
         initializeSearchBoxTextView();
         initializeVoiceSearchButton();
 
         mNewTabPageLayout.addOnLayoutChangeListener(this);
         setSearchProviderHasLogo(searchProviderHasLogo);
 
-        mTileGroup.startObserving(getMaxTileRows(searchProviderHasLogo) * MAX_TILE_COLUMNS);
+        mTileGroup.startObserving(getMaxTileRows(searchProviderHasLogo) * getMaxTileColumns());
 
         // Set up snippets
         NewTabPageAdapter newTabPageAdapter = new NewTabPageAdapter(mManager, mNewTabPageLayout,
                 mUiConfig, offlinePageBridge, mContextMenuManager, /* tileGroupDelegate = */ null);
         mRecyclerView.setAdapter(newTabPageAdapter);
 
         int scrollOffset;
         if (CardsVariationParameters.isScrollBelowTheFoldEnabled()) {
             scrollPosition = newTabPageAdapter.getFirstHeaderPosition();
             scrollOffset = getResources().getDimensionPixelSize(R.dimen.ntp_search_box_height);
@@ skipping 536 matching lines @@
     private static int getMaxTileRows(boolean searchProviderHasLogo) {
         int defaultValue = 2;
         if (!ChromeFeatureList.isEnabled(ChromeFeatureList.NTP_CONDENSED_LAYOUT)
                 && !searchProviderHasLogo) {
             defaultValue = 3;
         }
         return ChromeFeatureList.getFieldTrialParamByFeatureAsInt(
                 ChromeFeatureList.NTP_CONDENSED_LAYOUT, PARAM_NTP_MAX_TILE_ROWS, defaultValue);
     }
 
+    /**
+     * 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.
+     */
+    private int getMaxTileColumns() {
+        if (!mUiConfig.getCurrentDisplayStyle().isSmall()
+                && ChromeFeatureList.getFieldTrialParamByFeatureAsBoolean(
+                           ChromeFeatureList.NTP_CONDENSED_TILE_LAYOUT,
+                           PARAM_NTP_CONDENSED_TILE_LAYOUT_FOR_LARGE_SCREENS_ENABLED, false)) {
+            return 5;
+        }
+        return 4;
+    }
+
     private static int getTileTitleLines() {
         int defaultValue = 2;
         if (ChromeFeatureList.isEnabled(ChromeFeatureList.NTP_CONDENSED_LAYOUT)) {
             defaultValue = 1;
         }
         return ChromeFeatureList.getFieldTrialParamByFeatureAsInt(
                 ChromeFeatureList.NTP_CONDENSED_LAYOUT, PARAM_NTP_TILE_TITLE_LINES, defaultValue);
     }
 
+    private boolean shouldUseCondensedTileLayout() {
+        if (mUiConfig.getCurrentDisplayStyle().isSmall()) {
+            return ChromeFeatureList.getFieldTrialParamByFeatureAsBoolean(
+                    ChromeFeatureList.NTP_CONDENSED_TILE_LAYOUT,
+                    PARAM_NTP_CONDENSED_TILE_LAYOUT_FOR_SMALL_SCREENS_ENABLED, false);
+        }
+        return ChromeFeatureList.getFieldTrialParamByFeatureAsBoolean(
+                ChromeFeatureList.NTP_CONDENSED_TILE_LAYOUT,
+                PARAM_NTP_CONDENSED_TILE_LAYOUT_FOR_LARGE_SCREENS_ENABLED, false);

[Alexei Svitkine (slow), 2017/02/27 15:56:27]

Nit: Maybe make a helper function in this file that wraps this where you just
have to pass in param name and boolean?

This way, the calls will be simplified and easier to read.

[Michael van Ouwerkerk, 2017/02/27 16:53:57]

I'm not sure another helper function would help much, as both
shouldUseCondensedTileLayout() and
ChromeFeatureList.getFieldTrialParamByFeatureAsBoolean() are already helper
functions, and not that complex. The shorter param name helps a little though.

+    }
+
     @Override
     protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
         if (mNewTabPageLayout != null) {
             mNewTabPageLayout.setParentViewportHeight(MeasureSpec.getSize(heightMeasureSpec));
         }
         super.onMeasure(widthMeasureSpec, heightMeasureSpec);
 
         mRecyclerView.updatePeekingCardAndHeader();
     }
 
@@ skipping 21 matching lines @@
 
     /** @return the context menu manager. */
     public ContextMenuManager getContextMenuManager() {
         return mContextMenuManager;
     }
 
     // TileGroup.Observer interface.
 
     @Override
     public void onTileDataChanged() {
-        mTileGroup.renderTileViews(mTileGridLayout, !mLoadHasCompleted);
+        mTileGroup.renderTileViews(
+                mTileGridLayout, !mLoadHasCompleted, shouldUseCondensedTileLayout());
         mSnapshotTileGridChanged = true;
 
         // The page contents are initially hidden; otherwise they'll be drawn centered on the page
         // before the tiles are available and then jump upwards to make space once the tiles are
         // available.
         if (mNewTabPageLayout.getVisibility() != View.VISIBLE) {
             mNewTabPageLayout.setVisibility(View.VISIBLE);
         }
     }
 
@@ skipping 20 matching lines @@
     @Override
     public void onLoadTaskAdded() {
         mPendingLoadTasks++;
     }
 
     @Override
     public void onLoadTaskCompleted() {
         loadTaskCompleted();
     }
 }