[EoC] Restrict toolbar button to 320dp+ devices

Only enable the toolbar button for devices with a minimum screen width
of 320dp or greater.

BUG=865035

Change-Id: I6738739990cf0d1081a703afaaa703d644925779
Reviewed-on: https://chromium-review.googlesource.com/1141992
Commit-Queue: Theresa <twellington@chromium.org>
Reviewed-by: Matthew Jones <mdjones@chromium.org>
Cr-Commit-Position: refs/heads/master@{#576105}

chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java

@@ -1410,7 +1410,7 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
         }
 
         if (supportsContextualSuggestionsBottomSheet()
-                && FeatureUtilities.areContextualSuggestionsEnabled(isTablet())) {
+                && FeatureUtilities.areContextualSuggestionsEnabled(this)) {
             getLayoutInflater().inflate(R.layout.bottom_sheet, coordinator);
             mBottomSheet = coordinator.findViewById(R.id.bottom_sheet);
             mBottomSheet.init(coordinator, this);

chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchPanel.java

@@ -30,7 +30,6 @@ import org.chromium.chrome.browser.util.FeatureUtilities;
 import org.chromium.chrome.browser.util.MathUtils;
 import org.chromium.chrome.browser.widget.ScrimView;
 import org.chromium.chrome.browser.widget.ScrimView.ScrimParams;
-import org.chromium.ui.base.DeviceFormFactor;
 import org.chromium.ui.base.LocalizationUtils;
 import org.chromium.ui.resources.ResourceManager;
 
@@ -117,8 +116,7 @@ public class ContextualSearchPanel extends OverlayPanel {
     @Override
     protected void initializeUiState() {
         mUseGenericSheetUx = mActivity.supportsContextualSuggestionsBottomSheet()
-                && FeatureUtilities.areContextualSuggestionsEnabled(
-                           DeviceFormFactor.isNonMultiDisplayContextOnTablet(mActivity));
+                && FeatureUtilities.areContextualSuggestionsEnabled(mActivity);
     }
 
     @Override

chrome/android/java/src/org/chromium/chrome/browser/preferences/MainPreferences.java

@@ -25,7 +25,6 @@ import org.chromium.chrome.browser.search_engines.TemplateUrl;
 import org.chromium.chrome.browser.search_engines.TemplateUrlService;
 import org.chromium.chrome.browser.signin.SigninManager;
 import org.chromium.chrome.browser.util.FeatureUtilities;
-import org.chromium.ui.base.DeviceFormFactor;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -190,8 +189,7 @@ public class MainPreferences extends PreferenceFragment
             removePreferenceIfPresent(PREF_HOMEPAGE);
         }
 
-        boolean isTablet = DeviceFormFactor.isNonMultiDisplayContextOnTablet(getActivity());
-        if (FeatureUtilities.areContextualSuggestionsEnabled(isTablet)
+        if (FeatureUtilities.areContextualSuggestionsEnabled(getActivity())
                 && EnabledStateMonitor.shouldShowSettings()) {
             Preference contextualSuggesitons = addPreferenceIfAbsent(PREF_CONTEXTUAL_SUGGESTIONS);
             setOnOffSummary(contextualSuggesitons, EnabledStateMonitor.getEnabledState());

chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUtilities.java

@@ -41,6 +41,7 @@ import java.util.List;
  */
 public class FeatureUtilities {
     private static final String TAG = "FeatureUtilities";
+    private static final Integer CONTEXTUAL_SUGGESTIONS_TOOLBAR_MIN_DP = 320;
 
     private static Boolean sHasGoogleAccountAuthenticator;
     private static Boolean sHasRecognitionIntentHandler;
@@ -376,16 +377,20 @@ public class FeatureUtilities {
     }
 
     /**
-     * @param isTablet Whether the containing Activity is being displayed on a tablet-sized screen.
+     * @param activityContext The context for the containing activity.
      * @return Whether contextual suggestions are enabled.
      */
-    public static boolean areContextualSuggestionsEnabled(boolean isTablet) {
-        return !isTablet && !LocaleManager.getInstance().needToCheckForSearchEnginePromo()
+    public static boolean areContextualSuggestionsEnabled(Context activityContext) {
+        int smallestScreenWidth =
+                activityContext.getResources().getConfiguration().smallestScreenWidthDp;
+        return !DeviceFormFactor.isNonMultiDisplayContextOnTablet(activityContext)
+                && !LocaleManager.getInstance().needToCheckForSearchEnginePromo()
                 && isChromeModernDesignEnabled()
                 && (ChromeFeatureList.isEnabled(
                             ChromeFeatureList.CONTEXTUAL_SUGGESTIONS_BOTTOM_SHEET)
-                           || ChromeFeatureList.isEnabled(
-                                      ChromeFeatureList.CONTEXTUAL_SUGGESTIONS_BUTTON));
+                    || (smallestScreenWidth >= CONTEXTUAL_SUGGESTIONS_TOOLBAR_MIN_DP
+                        && ChromeFeatureList.isEnabled(
+                                ChromeFeatureList.CONTEXTUAL_SUGGESTIONS_BUTTON)));
     }
 
     /**