Merge pull request #8617 from brave/pr8614_android_tag_groups_fixes_1.23.x

kjozwiak · web-flow · commit dc17429b58a6 · 2021-04-22T22:58:02.000-04:00
[Android] Fixes for Tab Groups option (uplift to 1.23.x)
diff --git a/android/java/org/chromium/chrome/browser/BraveFeatureList.java b/android/java/org/chromium/chrome/browser/BraveFeatureList.java
@@ -18,7 +18,7 @@ public abstract class BraveFeatureList {
     public static final String ENABLE_TAB_GROUPS = "enable-tab-groups";
     public static final String ENABLE_TAB_GROUPS_DISABLED_VALUE = "2";
     public static final String ENABLE_TAB_GRID = "enable-tab-grid-layout";
-    public static final String ENABLE_TAB_GRID_DISABLED_VALUE = "7";
+    public static final String ENABLE_TAB_GRID_DISABLED_VALUE = "8";
 
     public static void enableFeature(String featureName, boolean enabled, String disabledValue) {
         BraveFeatureListJni.get().enableFeature(featureName, enabled, disabledValue);
diff --git a/android/java/org/chromium/chrome/browser/settings/AppearancePreferences.java b/android/java/org/chromium/chrome/browser/settings/AppearancePreferences.java
@@ -45,6 +45,7 @@ public void onCreate(Bundle savedInstanceState) {
                 ContextUtils.getApplicationContext());
         if (isTablet) {
             removePreferenceIfPresent(BravePreferenceKeys.BRAVE_BOTTOM_TOOLBAR_ENABLED_KEY);
+            removePreferenceIfPresent(PREF_BRAVE_ENABLE_TAB_GROUPS);
         }
 
         if (!NightModeUtils.isNightModeSupported()) {

Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,7 @@ public void onCreate(Bundle savedInstanceState) {`
`45`	`45`	`ContextUtils.getApplicationContext());`
`46`	`46`	`if (isTablet) {`
`47`	`47`	`removePreferenceIfPresent(BravePreferenceKeys.BRAVE_BOTTOM_TOOLBAR_ENABLED_KEY);`
	`48`	`+ removePreferenceIfPresent(PREF_BRAVE_ENABLE_TAB_GROUPS);`
`48`	`49`	`}`
`49`	`50`
`50`	`51`	`if (!NightModeUtils.isNightModeSupported()) {`