Browser: Reorder patches

From fe6159eba233afd6cbddd7f6b4b44ccab00aace8 Mon Sep 17 00:00:00 2001

From: althafvly <althafvly@gmail.com>

Date: Wed, 27 Sep 2023 20:38:00 +0530

Subject: [PATCH] Revert "Add option to force tablet UI"

This reverts commit 028be265dffbc175671a342978e11579e7c33dd9.

---

 .../ChromeAccessibilitySettingsDelegate.java  | 19 -------------------

 .../preferences/ChromePreferenceKeys.java     |  1 -

 .../LegacyChromePreferenceKeys.java           |  1 -

 .../omnibox/LocationBarCoordinator.java       |  2 +-

 .../toolbar/top/ToolbarControlContainer.java  |  5 +++--

 components/BUILD.gn                           |  6 +++---

 .../res/xml/accessibility_preferences.xml     |  5 -----

 .../accessibility/AccessibilitySettings.java  | 10 ----------

 .../AccessibilitySettingsDelegate.java        |  2 --

 ui/android/BUILD.gn                           |  2 --

 .../chromium/ui/base/DeviceFormFactor.java    |  5 -----

 11 files changed, 7 insertions(+), 51 deletions(-)

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/ChromeAccessibilitySettingsDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/ChromeAccessibilitySettingsDelegate.java

index 168965d4012cd..4bf2377cb2464 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/ChromeAccessibilitySettingsDelegate.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/ChromeAccessibilitySettingsDelegate.java

@@ -91,25 +91,6 @@ public class ChromeAccessibilitySettingsDelegate implements AccessibilitySetting

         return new ReaderForAccessibilityDelegate(mProfile);

     }

-    private static class ForceTabletUIDelegate implements BooleanPreferenceDelegate {

-        @Override

-        public boolean isEnabled() {

-            return SharedPreferencesManager.getInstance().readBoolean(

-                      ChromePreferenceKeys.FLAGS_FORCE_TABLET_UI_ENABLED, false);

-        }

-

-        @Override

-        public void setEnabled(boolean value) {

-            SharedPreferencesManager.getInstance().writeBoolean(

-                      ChromePreferenceKeys.FLAGS_FORCE_TABLET_UI_ENABLED, value);

-        }

-    }

-

-    @Override

-    public BooleanPreferenceDelegate getForceTabletUIDelegate() {

-        return new ForceTabletUIDelegate();

-    }

-

     private static class MoveTopToolbarToBottomDelegate implements BooleanPreferenceDelegate {

         @Override

         public boolean isEnabled() {

diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java

index a6978010c728a..6310df0220d8d 100644

--- a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java

+++ b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java

@@ -386,7 +386,6 @@ public final class ChromePreferenceKeys {

             AccessibilityConstants.FONT_USER_SET_FORCE_ENABLE_ZOOM;

     public static final String HISTORY_SHOW_HISTORY_INFO = "history_home_show_info";

-    public static final String FLAGS_FORCE_TABLET_UI_ENABLED = "force_tablet_ui_enabled";

     /** Keys used to save settings related to homepage. */

     public static final String HOMEPAGE_CUSTOM_URI = "homepage_custom_uri";

diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/LegacyChromePreferenceKeys.java b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/LegacyChromePreferenceKeys.java

index 92f7a055d6bac..3663a9ee67edf 100644

--- a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/LegacyChromePreferenceKeys.java

+++ b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/LegacyChromePreferenceKeys.java

@@ -65,7 +65,6 @@ public class LegacyChromePreferenceKeys {

                 ChromePreferenceKeys.FLAGS_CACHED_SWAP_PIXEL_FORMAT_TO_FIX_CONVERT_FROM_TRANSLUCENT,

                 ChromePreferenceKeys.FLAGS_CACHED_TAB_GROUPS_ANDROID_ENABLED,

                 ChromePreferenceKeys.FONT_USER_FONT_SCALE_FACTOR,

-                ChromePreferenceKeys.FLAGS_FORCE_TABLET_UI_ENABLED,

                 ChromePreferenceKeys.FONT_USER_SET_FORCE_ENABLE_ZOOM,

                 ChromePreferenceKeys.HISTORY_SHOW_HISTORY_INFO,

                 ChromePreferenceKeys.HOMEPAGE_CUSTOM_URI,

diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarCoordinator.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarCoordinator.java

index 378626ba1a735..e8dfa9326ac9e 100644

--- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarCoordinator.java

+++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarCoordinator.java

@@ -671,7 +671,7 @@ public class LocationBarCoordinator

     }

     private boolean isTabletWindow() {

-        return DeviceFormFactor.isWindowOnTablet(mWindowAndroid) || isTabletLayout();

+        return DeviceFormFactor.isWindowOnTablet(mWindowAndroid);

     }

     /* package */ LocationBarMediator getMediatorForTesting() {

diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarControlContainer.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarControlContainer.java

index 1f8f98c6a6424..ab6edcfda492f 100644

--- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarControlContainer.java

+++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarControlContainer.java

@@ -176,8 +176,9 @@ public class ToolbarControlContainer extends OptimizedFrameLayout implements Con

             return backgroundDrawable;

         } else {

-            Drawable backgroundDrawable = new ColorDrawable(

-                    ChromeColors.getPrimaryBackgroundColor(getContext(), incognito));

+            final Drawable backgroundDrawable =

+                    AppCompatResources.getDrawable(getContext(), R.drawable.toolbar_background)

+                            .mutate();

             backgroundDrawable.setTint(ChromeColors.getDefaultThemeColor(getContext(), incognito));

             backgroundDrawable.setTintMode(PorterDuff.Mode.MULTIPLY);

diff --git a/components/BUILD.gn b/components/BUILD.gn

index 1227c584867d0..fb3af484189fc 100644

--- a/components/BUILD.gn

+++ b/components/BUILD.gn

@@ -68,7 +68,7 @@ if (is_ios) {

 # Omit Lacros because it allows //components to depend on //chrome, which in

 # turn depends on //extensions.

-if (!is_chromeos_lacros && !is_android) {

+if (!is_chromeos_lacros) {

   disallowed_extension_deps_ = [

     # Components should largely not depend on //extensions. Since // extensions

     # is not a component target and is linked with //chrome, depending on most

@@ -730,7 +730,7 @@ test("components_unittests") {

   # On other platforms, no components should depend on Chrome.

   # Since //chrome depends on //extensions, we also only assert_no_deps on

   # extensions targets for non-lacros builds.

-  if (!is_chromeos_lacros  && !is_android) {

+  if (!is_chromeos_lacros) {

     assert_no_deps = [ "//chrome/*" ]

     assert_no_deps += disallowed_extension_deps_

   }

@@ -1018,7 +1018,7 @@ if (use_blink) {

     # dependency. On other platforms, no components should depend on Chrome.

     # Since //chrome depends on //extensions, we also only assert_no_deps on

     # extensions targets for non-lacros builds.

-    if (!is_chromeos_lacros  && !is_android) {

+    if (!is_chromeos_lacros) {

       assert_no_deps = [ "//chrome/*" ]

       assert_no_deps += disallowed_extension_deps_

     }

diff --git a/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml b/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml

index b5dc56add1362..e3868d349537a 100644

--- a/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml

+++ b/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml

@@ -41,11 +41,6 @@ found in the LICENSE file.

         android:summary="@string/accessibility_tab_switcher_summary"

         android:title="@string/accessibility_tab_switcher_title" />

-    <org.chromium.components.browser_ui.settings.ChromeBaseCheckBoxPreference

-        android:key="force_tablet_ui"

-        android:summary="@string/force_tablet_ui_summary"

-        android:title="@string/force_tablet_ui_title" />

-

     <Preference

         android:key="captions"

         android:title="@string/accessibility_captions_title"/>

diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java b/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java

index b7aa6e396f08c..8229cc0380208 100644

--- a/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java

+++ b/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java

@@ -31,8 +31,6 @@ public class AccessibilitySettings extends PreferenceFragmentCompat

     public static final String PREF_READER_FOR_ACCESSIBILITY = "reader_for_accessibility";

     public static final String PREF_CAPTIONS = "captions";

-    private BooleanPreferenceDelegate mForceTabletUIDelegate;

-    static final String PREF_FORCE_TABLET_UI = "force_tablet_ui";

     static final String PREF_MOVE_TOOLBAR_TO_BOTTOM = "move_toolbar_bottom";

     private TextScalePreference mTextScalePref;

     private PageZoomPreference mPageZoomDefaultZoomPref;

@@ -118,12 +116,6 @@ public class AccessibilitySettings extends PreferenceFragmentCompat

             getPreferenceScreen().removePreference(readerForAccessibilityPref);

         }

-        ChromeBaseCheckBoxPreference forceTabletUiPref =

-                (ChromeBaseCheckBoxPreference) findPreference(PREF_FORCE_TABLET_UI);

-        mForceTabletUIDelegate = mDelegate.getForceTabletUIDelegate();

-        forceTabletUiPref.setChecked(mForceTabletUIDelegate.isEnabled());

-        forceTabletUiPref.setOnPreferenceChangeListener(this);

-

         ChromeSwitchPreference accessibilityTabSwitcherPref =

                 (ChromeSwitchPreference) findPreference(

                         AccessibilityConstants.ACCESSIBILITY_TAB_SWITCHER);

@@ -186,8 +178,6 @@ public class AccessibilitySettings extends PreferenceFragmentCompat

             mFontSizePrefs.setUserFontScaleFactor((Float) newValue);

         } else if (PREF_FORCE_ENABLE_ZOOM.equals(preference.getKey())) {

             mFontSizePrefs.setForceEnableZoomFromUser((Boolean) newValue);

-        } else if (PREF_FORCE_TABLET_UI.equals(preference.getKey())) {

-            mForceTabletUIDelegate.setEnabled((Boolean) newValue);

         } else if (PREF_READER_FOR_ACCESSIBILITY.equals(preference.getKey())) {

             if (mReaderForAccessibilityDelegate != null) {

                 mReaderForAccessibilityDelegate.setEnabled((Boolean) newValue);

diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettingsDelegate.java b/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettingsDelegate.java

index 21b3fa0bb2d77..1508498a77d03 100644

--- a/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettingsDelegate.java

+++ b/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettingsDelegate.java

@@ -50,8 +50,6 @@ public interface AccessibilitySettingsDelegate {

      */

     BooleanPreferenceDelegate getReaderForAccessibilityDelegate();

-    BooleanPreferenceDelegate getForceTabletUIDelegate();

-

     /**

      * Allows the embedder to add more preferences to the preference screen.

      *

diff --git a/ui/android/BUILD.gn b/ui/android/BUILD.gn

index c548631abe029..b47847845ca31 100644

--- a/ui/android/BUILD.gn

+++ b/ui/android/BUILD.gn

@@ -408,8 +408,6 @@ android_library("ui_no_recycler_view_java") {

     ":ui_android_features_java",

     ":ui_java_resources",

     ":ui_utils_java",

-    # dependency for ui_no_recycler_view_java

-    "//chrome/browser/preferences:java",

     "//base:base_java",

     "//base:jni_java",

     "//build/android:build_java",

diff --git a/ui/android/java/src/org/chromium/ui/base/DeviceFormFactor.java b/ui/android/java/src/org/chromium/ui/base/DeviceFormFactor.java

index 3df825d11052e..b7efa9f648f31 100644

--- a/ui/android/java/src/org/chromium/ui/base/DeviceFormFactor.java

+++ b/ui/android/java/src/org/chromium/ui/base/DeviceFormFactor.java

@@ -12,8 +12,6 @@ import androidx.annotation.VisibleForTesting;

 import org.chromium.base.ContextUtils;

 import org.chromium.base.ThreadUtils;

 import org.chromium.base.annotations.CalledByNative;

-import org.chromium.chrome.browser.preferences.ChromePreferenceKeys;

-import org.chromium.chrome.browser.preferences.SharedPreferencesManager;

 import org.chromium.ui.R;

 import org.chromium.ui.display.DisplayAndroid;

 import org.chromium.ui.display.DisplayUtil;

@@ -64,9 +62,6 @@ public class DeviceFormFactor {

      *         E.g. http://developer.samsung.com/samsung-dex/testing

      */

     public static boolean isNonMultiDisplayContextOnTablet(Context context) {

-        if (SharedPreferencesManager.getInstance().readBoolean(

-                ChromePreferenceKeys.FLAGS_FORCE_TABLET_UI_ENABLED, false))

-            return true;

         return detectScreenWidthBucket(context) >= SCREEN_BUCKET_TABLET;

     }

-- 

2.34.1

From 40dbcbda0cdc25953cf9b9f4d683bd126d7b17ff Mon Sep 17 00:00:00 2001

From 43c7ba25c451ae331097701d254c0a6cdc84abe9 Mon Sep 17 00:00:00 2001

From: Daniel Micay <danielmicay@gmail.com>

Date: Thu, 27 May 2021 07:30:02 -0400

Subject: [PATCH 01/32] add trichrome browser apk targets

Subject: [PATCH 01/34] add trichrome browser apk targets

---

 chrome/android/BUILD.gn                   | 35 +++++++++++++++++++++++

 2 files changed, 37 insertions(+)

diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn

index 50967a14f3337..37263124c7d62 100644

index bdb85526b517f..2e0dd54c2adc5 100644

--- a/chrome/android/BUILD.gn

+++ b/chrome/android/BUILD.gn

@@ -2288,6 +2288,10 @@ if (current_toolchain == default_toolchain) {

@@ -2286,6 +2286,10 @@ if (current_toolchain == default_toolchain) {

     is_trichrome = true

     is_bundle_module = true

   }

   # Exists separately from chrome_public_base_module_java_for_test to allow

   # downstream to depend on test support packages without needing to depend on

@@ -2624,6 +2628,37 @@ if (current_toolchain == default_toolchain) {

@@ -2622,6 +2626,37 @@ if (current_toolchain == default_toolchain) {

       }

     }

   }

   # As compared to chrome_public_test_apk, this target contains only unit tests

   # that require on device capabilities. These tests are smaller, more tightly

diff --git a/chrome/android/chrome_public_apk_tmpl.gni b/chrome/android/chrome_public_apk_tmpl.gni

index bb5974ff9e5cc..a52989583c10f 100644

index ccaa12322330f..f29e50e67376b 100644

--- a/chrome/android/chrome_public_apk_tmpl.gni

+++ b/chrome/android/chrome_public_apk_tmpl.gni

@@ -454,6 +454,8 @@ template("chrome_common_apk_or_module_tmpl") {

From 887050fed164a632ac9e59c8f366941e09af1acf Mon Sep 17 00:00:00 2001

From 3f6487cf104b71f4c59706296560cf86ab4d81f9 Mon Sep 17 00:00:00 2001

From: fgei <fgei@gmail.com>

Date: Sun, 29 Aug 2021 19:31:00 +0000

Subject: [PATCH 1/3] disable browser sign in feature by default

Subject: [PATCH 01/16] disable browser sign in feature by default

---

 .../android/java/res/xml/main_preferences.xml | 24 -------------------

 5 files changed, 7 insertions(+), 32 deletions(-)

diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/java/res/xml/main_preferences.xml

index f68ca31ddaa2e..947de77a52ebd 100644

index 6ac62fbc63f75..8deab9b5a1919 100644

--- a/chrome/android/java/res/xml/main_preferences.xml

+++ b/chrome/android/java/res/xml/main_preferences.xml

@@ -9,30 +9,6 @@ found in the LICENSE file.

From fe84ead9cab442ddb15d1a662255f9ea9f6b1e05 Mon Sep 17 00:00:00 2001

From 6ff50ba07c5d28a23c93ee03d736d194d69e87af Mon Sep 17 00:00:00 2001

From: TheScarastic <warabhishek@e.email>

Date: Fri, 2 Dec 2022 10:10:43 +0000

Subject: [PATCH 02/32] chromium: Add 32 bit chrome app support

Subject: [PATCH 02/34] chromium: Add 32 bit chrome app support

Signed-off-by: althafvly <althafvly@gmail.com>

---

 1 file changed, 9 insertions(+)

diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn

index 37263124c7d62..ecf308eda9b28 100644

index 2e0dd54c2adc5..ded951686da64 100644

--- a/chrome/android/BUILD.gn

+++ b/chrome/android/BUILD.gn

@@ -2658,6 +2658,15 @@ if (current_toolchain == default_toolchain) {

@@ -2656,6 +2656,15 @@ if (current_toolchain == default_toolchain) {

       is_64_bit_browser = true

       include_32_bit_webview = false

     }

From 59a7e768557b0ccf0e6fd2bd81ed8f4a90019ad0 Mon Sep 17 00:00:00 2001

From e272cb7530f34784b4020e4231dc66e5263ae3c1 Mon Sep 17 00:00:00 2001

From: Daniel Micay <danielmicay@gmail.com>

Date: Wed, 23 Nov 2016 09:26:51 -0500

Subject: [PATCH 2/3] disable contextual search by default

Subject: [PATCH 02/16] disable contextual search by default

---

 .../browser/contextualsearch/ContextualSearchFieldTrial.java    | 2 +-

     /**

diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profile.cc

index 6cffe941b26f9..8cb7e0e113203 100644

index c85f0f3bca9aa..d4fd34bd1132a 100644

--- a/chrome/browser/profiles/profile.cc

+++ b/chrome/browser/profiles/profile.cc

@@ -315,7 +315,7 @@ void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {