Commit 82ee5dab authored by Mei Liang's avatar Mei Liang Committed by Commit Bot

Add feature util for tab group

This patch adds a method in FeatureUtilities to check whether the tab
group feature is enabled and available for use.

Bug: 934557
Change-Id: I06677c81b772d905e5a5689536de2c1e362aa08c
Reviewed-on: https://chromium-review.googlesource.com/c/1489973
Commit-Queue: Mei Liang <meiliang@chromium.org>
Reviewed-by: default avatarYusuf Ozuysal <yusufo@chromium.org>
Cr-Commit-Position: refs/heads/master@{#635823}
parent 63a6f808
...@@ -297,7 +297,7 @@ public abstract class ChromeFeatureList { ...@@ -297,7 +297,7 @@ public abstract class ChromeFeatureList {
public static final String SPANNABLE_INLINE_AUTOCOMPLETE = "SpannableInlineAutocomplete"; public static final String SPANNABLE_INLINE_AUTOCOMPLETE = "SpannableInlineAutocomplete";
public static final String SUBRESOURCE_FILTER = "SubresourceFilter"; public static final String SUBRESOURCE_FILTER = "SubresourceFilter";
public static final String QUERY_IN_OMNIBOX = "QueryInOmnibox"; public static final String QUERY_IN_OMNIBOX = "QueryInOmnibox";
public static final String TAB_GROUP_ANDROID = "TabGroupsAndroid"; public static final String TAB_GROUPS_ANDROID = "TabGroupsAndroid";
public static final String TAB_GRID_LAYOUT_ANDROID = "TabGridLayoutAndroid"; public static final String TAB_GRID_LAYOUT_ANDROID = "TabGridLayoutAndroid";
public static final String TAB_REPARENTING = "TabReparenting"; public static final String TAB_REPARENTING = "TabReparenting";
public static final String TAB_SWITCHER_ON_RETURN = "TabSwitcherOnReturn"; public static final String TAB_SWITCHER_ON_RETURN = "TabSwitcherOnReturn";
......
...@@ -189,7 +189,7 @@ public class ContextMenuManager implements OnCloseContextMenuListener { ...@@ -189,7 +189,7 @@ public class ContextMenuManager implements OnCloseContextMenuListener {
put(ContextMenuItemId.OPEN_IN_NEW_TAB, put(ContextMenuItemId.OPEN_IN_NEW_TAB,
ChromeFeatureList.isInitialized() ChromeFeatureList.isInitialized()
&& ChromeFeatureList.isEnabled( && ChromeFeatureList.isEnabled(
ChromeFeatureList.TAB_GROUP_ANDROID) ChromeFeatureList.TAB_GROUPS_ANDROID)
? R.string.contextmenu_open_in_new_tab_group ? R.string.contextmenu_open_in_new_tab_group
: R.string.contextmenu_open_in_new_tab); : R.string.contextmenu_open_in_new_tab);
put(ContextMenuItemId.OPEN_IN_INCOGNITO_TAB, put(ContextMenuItemId.OPEN_IN_INCOGNITO_TAB,
......
...@@ -22,7 +22,7 @@ import org.chromium.ui.widget.ViewRectProvider; ...@@ -22,7 +22,7 @@ import org.chromium.ui.widget.ViewRectProvider;
*/ */
public class TabGroupUtils { public class TabGroupUtils {
public static void maybeShowIPH(@FeatureConstants String featureName, View view) { public static void maybeShowIPH(@FeatureConstants String featureName, View view) {
if (!ChromeFeatureList.isEnabled(ChromeFeatureList.TAB_GROUP_ANDROID)) return; if (!ChromeFeatureList.isEnabled(ChromeFeatureList.TAB_GROUPS_ANDROID)) return;
Resources res = view.getContext().getResources(); Resources res = view.getContext().getResources();
@StringRes @StringRes
......
...@@ -468,6 +468,16 @@ public class FeatureUtilities { ...@@ -468,6 +468,16 @@ public class FeatureUtilities {
&& ChromeFeatureList.isEnabled(ChromeFeatureList.TAB_GRID_LAYOUT_ANDROID); && ChromeFeatureList.isEnabled(ChromeFeatureList.TAB_GRID_LAYOUT_ANDROID);
} }
/**
* @param activityContext The context for the containing {@link android.app.Activity}.
* @return Whether the tab group feature is enabled and available for use.
*/
public static boolean isTabGroupsEnabled(Context activityContext) {
return !DeviceFormFactor.isNonMultiDisplayContextOnTablet(activityContext)
&& !SysUtils.isLowEndDevice() && !DeviceClassManager.enableAccessibilityLayout()
&& ChromeFeatureList.isEnabled(ChromeFeatureList.TAB_GROUPS_ANDROID);
}
/** /**
* @return Whether this device is running Android Go. This is assumed when we're running Android * @return Whether this device is running Android Go. This is assumed when we're running Android
* O or later and we're on a low-end device. * O or later and we're on a low-end device.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment