From d73a55d8c2c81b7469fd7309d9fa607bb7247d7c Mon Sep 17 00:00:00 2001 From: Carmelo Messina Date: Thu, 19 Oct 2023 17:57:41 +0200 Subject: [PATCH] #432 fix find toolbar --- .../Add-option-to-force-tablet-UI.patch | 25 ++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/build/patches/Add-option-to-force-tablet-UI.patch b/build/patches/Add-option-to-force-tablet-UI.patch index 5d0257c7..54e965db 100644 --- a/build/patches/Add-option-to-force-tablet-UI.patch +++ b/build/patches/Add-option-to-force-tablet-UI.patch @@ -5,6 +5,7 @@ Subject: Add option to force tablet UI License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- .../ChromeAccessibilitySettingsDelegate.java | 19 +++++++++++++++++++ + .../chrome/browser/ui/RootUiCoordinator.java | 5 ++++- .../preferences/ChromePreferenceKeys.java | 1 + .../LegacyChromePreferenceKeys.java | 1 + .../omnibox/LocationBarCoordinator.java | 2 +- @@ -16,7 +17,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../AccessibilitySettingsDelegate.java | 2 ++ ui/android/BUILD.gn | 2 ++ .../chromium/ui/base/DeviceFormFactor.java | 5 +++++ - 12 files changed, 58 insertions(+), 7 deletions(-) + 13 files changed, 62 insertions(+), 8 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 --- a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/ChromeAccessibilitySettingsDelegate.java @@ -47,6 +48,28 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/s @Override public void addExtraPreferences(PreferenceFragmentCompat fragment) { if (ImageDescriptionsController.getInstance().shouldShowImageDescriptionsMenuItem()) { +diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java +--- a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java ++++ b/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java +@@ -98,6 +98,7 @@ import org.chromium.chrome.browser.paint_preview.DemoPaintPreview; + import org.chromium.chrome.browser.password_manager.ManagePasswordsReferrer; + import org.chromium.chrome.browser.password_manager.PasswordManagerLauncher; + import org.chromium.chrome.browser.preferences.SharedPreferencesManager; ++import org.chromium.chrome.browser.preferences.ChromePreferenceKeys; + import org.chromium.chrome.browser.price_tracking.PriceTrackingButtonController; + import org.chromium.chrome.browser.profiles.Profile; + import org.chromium.chrome.browser.quick_delete.QuickDeleteController; +@@ -1417,7 +1418,9 @@ public class RootUiCoordinator + if (!mSupportsFindInPageSupplier.getAsBoolean()) return; + + int stubId = R.id.find_toolbar_stub; +- if (DeviceFormFactor.isNonMultiDisplayContextOnTablet(mActivity)) { ++ if (DeviceFormFactor.isNonMultiDisplayContextOnTablet(mActivity) && ++ !SharedPreferencesManager.getInstance().readBoolean( ++ ChromePreferenceKeys.FLAGS_FORCE_TABLET_UI_ENABLED, false)) { + stubId = R.id.find_toolbar_tablet_stub; + } + mFindToolbarManager = new FindToolbarManager(mActivity.findViewById(stubId), 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 --- 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