From: uazo <uazo@users.noreply.github.com>
Date: Tue, 1 Apr 2025 11:37:52 +0000
Subject: Disable Android Tab Declutter

Original License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
---
 chrome/android/java/res/xml/main_preferences.xml               | 3 ++-
 .../org/chromium/chrome/browser/tab/TabArchiveSettings.java    | 3 ++-
 .../chrome_feature_list_cc/Disable-Android-Tab-Declutter.inc   | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)
 create mode 100644 cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Disable-Android-Tab-Declutter.inc

diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/java/res/xml/main_preferences.xml
--- a/chrome/android/java/res/xml/main_preferences.xml
+++ b/chrome/android/java/res/xml/main_preferences.xml
@@ -104,7 +104,8 @@ found in the LICENSE file.
         android:fragment="org.chromium.chrome.browser.tasks.tab_management.TabsSettings"
         android:key="tabs"
         android:order="19"
-        android:title="@string/tabs_settings_title"/>
+        android:title="@string/tabs_settings_title"
+        app:isPreferenceVisible="false"/>
     <Preference
         android:fragment="org.chromium.chrome.browser.glic.GlicSettings"
         android:key="glic"
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabArchiveSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabArchiveSettings.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabArchiveSettings.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabArchiveSettings.java
@@ -105,11 +105,12 @@ public class TabArchiveSettings {
         // are created, and tabs disappearing from tests is very unexpected. For archive tests,
         // this will need to be turned on manually.
         return mPrefsManager.readBoolean(
-                ChromePreferenceKeys.TAB_DECLUTTER_ARCHIVE_ENABLED, !BuildConfig.IS_FOR_TEST);
+                ChromePreferenceKeys.TAB_DECLUTTER_ARCHIVE_ENABLED, false);
     }
 
     /** Sets whether archive is enabled in settings. */
     public void setArchiveEnabled(boolean enabled) {
+        enabled = false;
         mPrefsManager.writeBoolean(ChromePreferenceKeys.TAB_DECLUTTER_ARCHIVE_ENABLED, enabled);
     }
 
diff --git a/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Disable-Android-Tab-Declutter.inc b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Disable-Android-Tab-Declutter.inc
new file mode 100644
--- /dev/null
+++ b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Disable-Android-Tab-Declutter.inc
@@ -0,0 +1 @@
+// empty
--