diff --git a/build/patches/Add-setting-to-invert-tap-and-long-tap.patch b/build/patches/Add-setting-to-invert-tap-and-long-tap.patch index 6c4816ce..89026666 100644 --- a/build/patches/Add-setting-to-invert-tap-and-long-tap.patch +++ b/build/patches/Add-setting-to-invert-tap-and-long-tap.patch @@ -48,9 +48,9 @@ diff --git a/chrome/android/java/res/values/ids.xml b/chrome/android/java/res/va diff --git a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/AccessibilitySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/AccessibilitySettings.java --- a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/AccessibilitySettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/AccessibilitySettings.java -@@ -53,6 +53,9 @@ public class AccessibilitySettings extends PreferenceFragmentCompat - static final String PREF_MOVE_TOOLBAR_TO_BOTTOM = "move_toolbar_bottom"; +@@ -55,6 +55,9 @@ public class AccessibilitySettings extends PreferenceFragmentCompat private BooleanPreferenceDelegate mMoveTopToolbarToBottomDelegate; + private BooleanPreferenceDelegate mDisableToolbarSwipeUpDelegate; + static final String PREF_ALWAYS_SHOW_CONTEXTMENU_ON_LINKS = "always_show_contextmenu_on_links"; + private BooleanPreferenceDelegate mShowAlwaysContextMenuOnLinksDelegate; @@ -58,9 +58,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/s private TextScalePreference mTextScalePref; private PageZoomPreference mPageZoomDefaultZoomPref; private ChromeSwitchPreference mPageZoomIncludeOSAdjustment; -@@ -166,6 +169,12 @@ public class AccessibilitySettings extends PreferenceFragmentCompat - mMoveToolbarToBottomPref.setChecked(mMoveTopToolbarToBottomDelegate.isEnabled()); - mMoveToolbarToBottomPref.setOnPreferenceChangeListener(this); +@@ -174,6 +177,12 @@ public class AccessibilitySettings extends PreferenceFragmentCompat + mDisableToolbarSwipeUpPref.setChecked(mDisableToolbarSwipeUpDelegate.isEnabled()); + mDisableToolbarSwipeUpPref.setOnPreferenceChangeListener(this); + ChromeSwitchPreference mShowAlwaysContextMenuOnLinksPref = + (ChromeSwitchPreference) findPreference(PREF_ALWAYS_SHOW_CONTEXTMENU_ON_LINKS); @@ -71,10 +71,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/s Preference captions = findPreference(PREF_CAPTIONS); captions.setOnPreferenceClickListener( preference -> { -@@ -251,6 +260,9 @@ public class AccessibilitySettings extends PreferenceFragmentCompat - } else if (PREF_MOVE_TOOLBAR_TO_BOTTOM.equals(preference.getKey())) { - mMoveTopToolbarToBottomDelegate.setEnabled((Boolean) newValue); +@@ -262,6 +271,9 @@ public class AccessibilitySettings extends PreferenceFragmentCompat mDelegate.requestRestart(getActivity()); + } else if (PREF_DISABLE_TOOLBAR_SWIPE_UP.equals(preference.getKey())) { + mDisableToolbarSwipeUpDelegate.setEnabled((Boolean) newValue); + } else if (PREF_ALWAYS_SHOW_CONTEXTMENU_ON_LINKS.equals(preference.getKey())) { + mShowAlwaysContextMenuOnLinksDelegate.setEnabled((Boolean) newValue); + mDelegate.requestRestart(getActivity()); @@ -84,7 +84,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/s 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 +++ b/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/ChromeAccessibilitySettingsDelegate.java -@@ -118,6 +118,24 @@ public class ChromeAccessibilitySettingsDelegate implements AccessibilitySetting +@@ -136,6 +136,24 @@ public class ChromeAccessibilitySettingsDelegate implements AccessibilitySetting mSnackbarManager.showSnackbar(mSnackbar); } @@ -194,7 +194,7 @@ diff --git a/chrome/browser/contextmenu/java/src/org/chromium/chrome/browser/con diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc --- a/chrome/browser/flags/android/chrome_feature_list.cc +++ b/chrome/browser/flags/android/chrome_feature_list.cc -@@ -281,6 +281,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { +@@ -283,6 +283,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { &kTabGroupParityAndroid, &kTabletTabSwitcherLongPressMenu, &kTabletToolbarIncognitoStatus, @@ -205,8 +205,8 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java -@@ -340,6 +340,8 @@ public abstract class ChromeFeatureList { - public static final String NOTIFICATION_ONE_TAP_UNSUBSCRIBE = "NotificationOneTapUnsubscribe"; +@@ -342,6 +342,8 @@ public abstract class ChromeFeatureList { + "DisableToolbarSwipeUp"; public static final String MOVE_TOP_TOOLBAR_TO_BOTTOM = "MoveTopToolbarToBottom"; + public static final String SHOW_ALWAYS_CONTEXT_MENU_ON_LINKS = @@ -214,8 +214,8 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f public static final String NOTIFICATION_PERMISSION_VARIANT = "NotificationPermissionVariant"; public static final String NOTIFICATION_PERMISSION_BOTTOM_SHEET = "NotificationPermissionBottomSheet"; -@@ -624,6 +626,8 @@ public abstract class ChromeFeatureList { - newCachedFlag(OMNIBOX_MATCH_TOOLBAR_AND_STATUS_BAR_COLOR, false); +@@ -628,6 +630,8 @@ public abstract class ChromeFeatureList { + newCachedFlag(DISABLE_TOOLBAR_SWIPE_UP, false); public static final CachedFlag sMoveTopToolbarToBottom = newCachedFlag(MOVE_TOP_TOOLBAR_TO_BOTTOM, false); + public static final CachedFlag sShowAlwaysContextMenuOnLinks = @@ -223,7 +223,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f public static final CachedFlag sOmniboxModernizeVisualUpdate = newCachedFlag(OMNIBOX_MODERNIZE_VISUAL_UPDATE, true); public static final CachedFlag sOptimizationGuidePushNotifications = -@@ -780,6 +784,7 @@ public abstract class ChromeFeatureList { +@@ -785,6 +789,7 @@ public abstract class ChromeFeatureList { sTabWindowManagerReportIndicesMismatch, sToolbarUseHardwareBitmapDraw, sUseChimeAndroidSdk, @@ -234,9 +234,9 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd -@@ -1678,6 +1678,12 @@ Your Google account may have other forms of browsing history like searches and a - - Move toolbar to bottom +@@ -1672,6 +1672,12 @@ Your Google account may have other forms of browsing history like searches and a + + Disable toolbar swipe up + + Always open the context menu in the links @@ -247,7 +247,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro -@@ -2834,6 +2840,9 @@ To change this setting, BEGIN_LINKclear the Chrome da +@@ -2828,6 +2834,9 @@ To change this setting, BEGIN_LINKclear the Chrome da Open in new Chrome tab @@ -275,9 +275,9 @@ diff --git a/components/browser_ui/accessibility/android/java/res/xml/accessibil 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 --- 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 -@@ -38,6 +38,8 @@ public interface AccessibilitySettingsDelegate { - +@@ -39,6 +39,8 @@ public interface AccessibilitySettingsDelegate { BooleanPreferenceDelegate getMoveTopToolbarToBottomDelegate(); + BooleanPreferenceDelegate getDisableToolbarSwipeUpDelegate(); + BooleanPreferenceDelegate getShowAlwaysContextMenuOnLinksDelegate(); + diff --git a/build/patches/Customize-selection-popup.patch b/build/patches/Customize-selection-popup.patch index 1d8fbe20..6754cca9 100644 --- a/build/patches/Customize-selection-popup.patch +++ b/build/patches/Customize-selection-popup.patch @@ -153,11 +153,10 @@ new file mode 100644 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 --- a/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml +++ b/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml -@@ -68,4 +68,28 @@ found in the LICENSE file. - android:key="move_toolbar_bottom" - android:summary="@string/move_toolbar_bottom_summary" - android:title="@string/move_toolbar_bottom_title" /> -+ +@@ -72,4 +72,28 @@ found in the LICENSE file. + android:key="disable_toolbar_swipeup" + android:title="@string/disable_toolbar_swipe_up" /> + + @@ -181,6 +180,7 @@ diff --git a/components/browser_ui/accessibility/android/java/res/xml/accessibil + android:key="selection_popup_smart_text" + android:summary="@string/selection_popup_smart_text_summary" + android:title="@string/selection_popup_smart_text_title" /> ++ diff --git a/content/public/android/java/src/org/chromium/content/browser/selection/SelectActionMenuHelper.java b/content/public/android/java/src/org/chromium/content/browser/selection/SelectActionMenuHelper.java --- a/content/public/android/java/src/org/chromium/content/browser/selection/SelectActionMenuHelper.java diff --git a/build/patches/User-agent-customization.patch b/build/patches/User-agent-customization.patch index 266c0cac..f01ceb69 100644 --- a/build/patches/User-agent-customization.patch +++ b/build/patches/User-agent-customization.patch @@ -531,9 +531,9 @@ new file mode 100644 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.java --- a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.java -@@ -94,6 +94,11 @@ import org.chromium.chrome.browser.preferences.Pref; - import org.chromium.chrome.browser.profiles.ProfileManager; - import org.chromium.components.user_prefs.UserPrefs; +@@ -81,6 +81,11 @@ import org.chromium.url.GURL; + import java.nio.ByteBuffer; + import java.util.Objects; +import org.chromium.content_public.browser.NavigationController; +import org.chromium.chrome.browser.preferences.ChromePreferenceKeys; @@ -543,7 +543,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.jav /** * Implementation of the interface {@link Tab}. Contains and manages a {@link ContentView}. This * class is not intended to be extended. -@@ -632,6 +637,32 @@ class TabImpl implements Tab { +@@ -619,6 +624,32 @@ class TabImpl implements Tab { params.setOverrideUserAgent(calculateUserAgentOverrideOption(null)); } @@ -576,7 +576,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.jav LoadUrlResult result = loadUrlInternal(params, fixedUrl); for (TabObserver observer : mObservers) { -@@ -1597,9 +1628,17 @@ class TabImpl implements Tab { +@@ -1580,9 +1611,17 @@ class TabImpl implements Tab { mWebContents.setImportance(mImportance); @@ -595,7 +595,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.jav mContentView.addOnAttachStateChangeListener(mAttachStateChangeListener); updateInteractableState(); -@@ -1790,6 +1829,10 @@ class TabImpl implements Tab { +@@ -1749,6 +1788,10 @@ class TabImpl implements Tab { } mIsBeingRestored = true; for (TabObserver observer : mObservers) observer.onRestoreStarted(this); @@ -606,7 +606,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.jav } finally { TraceEvent.end("Tab.restoreIfNeeded"); } -@@ -2054,6 +2097,13 @@ class TabImpl implements Tab { +@@ -2013,6 +2056,13 @@ class TabImpl implements Tab { } private @UserAgentOverrideOption int calculateUserAgentOverrideOption(@Nullable GURL url) { @@ -620,7 +620,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.jav WebContents webContents = getWebContents(); boolean currentRequestDesktopSite = TabUtils.isUsingDesktopUserAgent(webContents); @TabUserAgent int tabUserAgent = TabUtils.getTabUserAgent(this); -@@ -2135,6 +2185,48 @@ class TabImpl implements Tab { +@@ -2094,6 +2144,48 @@ class TabImpl implements Tab { } }