diff --git a/android/brave_java_sources.gni b/android/brave_java_sources.gni index 3b250b7be65..916aa0adac8 100644 --- a/android/brave_java_sources.gni +++ b/android/brave_java_sources.gni @@ -275,7 +275,6 @@ brave_java_sources = [ "../../brave/android/java/org/chromium/chrome/browser/qrreader/CameraSource.java", "../../brave/android/java/org/chromium/chrome/browser/qrreader/CameraSourcePreview.java", "../../brave/android/java/org/chromium/chrome/browser/query_tiles/BraveQueryTileSection.java", - "../../brave/android/java/org/chromium/chrome/browser/quickactionsearchwidget/BraveQuickActionSearchWidgetProvider.java", "../../brave/android/java/org/chromium/chrome/browser/rate/BraveAskPlayStoreRatingDialog.java", "../../brave/android/java/org/chromium/chrome/browser/rate/BraveRateDialogFragment.java", "../../brave/android/java/org/chromium/chrome/browser/rate/BraveRateThanksFeedbackDialog.java", diff --git a/android/java/apk_for_test.flags b/android/java/apk_for_test.flags index a9ae555727a..7340aef1fd2 100644 --- a/android/java/apk_for_test.flags +++ b/android/java/apk_for_test.flags @@ -107,19 +107,6 @@ *** runMenuItemEnterAnimations(...); } --keep class org.chromium.chrome.browser.quickactionsearchwidget.QuickActionSearchWidgetProvider$QuickActionSearchWidgetProviderDino - --keep class org.chromium.chrome.browser.quickactionsearchwidget.QuickActionSearchWidgetProvider$QuickActionSearchWidgetProviderSearch - --keep class org.chromium.chrome.browser.quickactionsearchwidget.QuickActionSearchWidgetProvider { - *** setWidgetEnabled(...); - *** setWidgetComponentEnabled(...); -} - --keep class org.chromium.chrome.browser.quickactionsearchwidget.BraveQuickActionSearchWidgetProvider { - *** setWidgetEnabled(...); -} - -keep class org.chromium.chrome.browser.ui.appmenu.BraveAppMenu { public (...); } diff --git a/android/java/org/chromium/chrome/browser/quickactionsearchwidget/BraveQuickActionSearchWidgetProvider.java b/android/java/org/chromium/chrome/browser/quickactionsearchwidget/BraveQuickActionSearchWidgetProvider.java deleted file mode 100644 index 3acd36c1dc9..00000000000 --- a/android/java/org/chromium/chrome/browser/quickactionsearchwidget/BraveQuickActionSearchWidgetProvider.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - Copyright (c) 2022 The Brave Authors. All rights reserved. - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this file, - You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -package org.chromium.chrome.browser.quickactionsearchwidget; - -import androidx.annotation.NonNull; - -import org.chromium.chrome.browser.quickactionsearchwidget.QuickActionSearchWidgetProvider; - -public abstract class BraveQuickActionSearchWidgetProvider extends QuickActionSearchWidgetProvider { - public static void setWidgetEnabled( - boolean shouldEnableQuickActionSearchWidget, boolean shouldEnableDinoVariant) { - setWidgetComponentEnabled(QuickActionSearchWidgetProviderSearch.class, false); - setWidgetComponentEnabled(QuickActionSearchWidgetProviderDino.class, false); - } - - public static void setWidgetComponentEnabled( - @NonNull Class component, - boolean shouldEnableWidgetComponent) { - assert false : "setWidgetComponentEnabled should be redirected to parent in bytecode!"; - } -} diff --git a/android/javatests/org/chromium/chrome/browser/BytecodeTest.java b/android/javatests/org/chromium/chrome/browser/BytecodeTest.java index 3392e2e82c4..787e161375a 100644 --- a/android/javatests/org/chromium/chrome/browser/BytecodeTest.java +++ b/android/javatests/org/chromium/chrome/browser/BytecodeTest.java @@ -293,14 +293,6 @@ public class BytecodeTest { Assert.assertTrue(classExists("org/chromium/chrome/browser/omnibox/LocationBarMediator")); Assert.assertTrue( classExists("org/chromium/chrome/browser/omnibox/BraveLocationBarMediator")); - Assert.assertTrue(classExists( - "org/chromium/chrome/browser/quickactionsearchwidget/QuickActionSearchWidgetProvider")); - Assert.assertTrue(classExists( - "org/chromium/chrome/browser/quickactionsearchwidget/QuickActionSearchWidgetProvider$QuickActionSearchWidgetProviderDino")); - Assert.assertTrue(classExists( - "org/chromium/chrome/browser/quickactionsearchwidget/QuickActionSearchWidgetProvider$QuickActionSearchWidgetProviderSearch")); - Assert.assertTrue(classExists( - "org/chromium/chrome/browser/quickactionsearchwidget/BraveQuickActionSearchWidgetProvider")); Assert.assertTrue(classExists("org/chromium/chrome/browser/tasks/ReturnToChromeUtil")); Assert.assertTrue(classExists("org/chromium/chrome/browser/IntentHandler")); Assert.assertTrue(classExists("org/chromium/chrome/browser/BraveIntentHandler")); @@ -457,12 +449,6 @@ public class BytecodeTest { "isJavascriptSchemeOrInvalidUrl", true, boolean.class, String.class)); Assert.assertTrue(methodExists("org/chromium/chrome/browser/IntentHandler", "extractUrlFromIntent", true, String.class, Intent.class)); - Assert.assertTrue(methodExists( - "org/chromium/chrome/browser/quickactionsearchwidget/QuickActionSearchWidgetProvider", - "setWidgetEnabled", false, null)); - Assert.assertTrue(methodExists( - "org/chromium/chrome/browser/quickactionsearchwidget/QuickActionSearchWidgetProvider", - "setWidgetComponentEnabled", false, null)); Assert.assertTrue(methodExists( "org/chromium/chrome/browser/notifications/permissions/NotificationPermissionRationaleDialogController", "wrapDialogDismissalCallback", true, Callback.class, Callback.class)); diff --git a/build/android/bytecode/BUILD.gn b/build/android/bytecode/BUILD.gn index b79a65e1014..bb930c86f6b 100644 --- a/build/android/bytecode/BUILD.gn +++ b/build/android/bytecode/BUILD.gn @@ -60,7 +60,6 @@ java_binary("java_bytecode_rewriter") { "//brave/build/android/bytecode/java/org/brave/bytecode/BravePreferenceFragmentClassAdapter.java", "//brave/build/android/bytecode/java/org/brave/bytecode/BravePureJavaExceptionReporterClassAdapter.java", "//brave/build/android/bytecode/java/org/brave/bytecode/BraveQueryTileSectionClassAdapter.java", - "//brave/build/android/bytecode/java/org/brave/bytecode/BraveQuickActionSearchWidgetProviderClassAdapter.java", "//brave/build/android/bytecode/java/org/brave/bytecode/BraveReaderModeManagerClassAdapter.java", "//brave/build/android/bytecode/java/org/brave/bytecode/BraveReturnToChromeUtilClassAdapter.java", "//brave/build/android/bytecode/java/org/brave/bytecode/BraveSearchEngineAdapterClassAdapter.java", diff --git a/build/android/bytecode/java/org/brave/bytecode/BraveClassAdapter.java b/build/android/bytecode/java/org/brave/bytecode/BraveClassAdapter.java index 906d0378b3e..068fd27f890 100644 --- a/build/android/bytecode/java/org/brave/bytecode/BraveClassAdapter.java +++ b/build/android/bytecode/java/org/brave/bytecode/BraveClassAdapter.java @@ -51,7 +51,6 @@ public class BraveClassAdapter { chain = new BraveMostVisitedTilesMediatorClassAdapter(chain); chain = new BraveNewTabPageClassAdapter(chain); chain = new BraveNewTabPageLayoutClassAdapter(chain); - chain = new BraveQuickActionSearchWidgetProviderClassAdapter(chain); chain = new BraveNotificationManagerProxyImplClassAdapter(chain); chain = new BraveNotificationPermissionRationaleDialogControllerClassAdapter(chain); chain = new BravePasswordSettingsBaseClassAdapter(chain); diff --git a/build/android/bytecode/java/org/brave/bytecode/BraveQuickActionSearchWidgetProviderClassAdapter.java b/build/android/bytecode/java/org/brave/bytecode/BraveQuickActionSearchWidgetProviderClassAdapter.java deleted file mode 100644 index d0b29998da1..00000000000 --- a/build/android/bytecode/java/org/brave/bytecode/BraveQuickActionSearchWidgetProviderClassAdapter.java +++ /dev/null @@ -1,24 +0,0 @@ -/* Copyright (c) 2022 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ - -package org.brave.bytecode; - -import org.objectweb.asm.ClassVisitor; - -public class BraveQuickActionSearchWidgetProviderClassAdapter extends BraveClassVisitor { - static String sQuickActionSearchWidgetProviderClassName = - "org/chromium/chrome/browser/quickactionsearchwidget/QuickActionSearchWidgetProvider"; - static String sBraveQuickActionSearchWidgetProviderClassName = - "org/chromium/chrome/browser/quickactionsearchwidget/BraveQuickActionSearchWidgetProvider"; - - public BraveQuickActionSearchWidgetProviderClassAdapter(ClassVisitor visitor) { - super(visitor); - changeMethodOwner(sQuickActionSearchWidgetProviderClassName, "setWidgetEnabled", - sBraveQuickActionSearchWidgetProviderClassName); - - deleteMethod(sBraveQuickActionSearchWidgetProviderClassName, "setWidgetComponentEnabled"); - makePublicMethod(sQuickActionSearchWidgetProviderClassName, "setWidgetComponentEnabled"); - } -} diff --git a/patches/chrome-android-java-AndroidManifest.xml.patch b/patches/chrome-android-java-AndroidManifest.xml.patch index ae4d144d6b5..6bbed45fd75 100644 --- a/patches/chrome-android-java-AndroidManifest.xml.patch +++ b/patches/chrome-android-java-AndroidManifest.xml.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml -index e861de3a552a0ad5719f910a398898396e7d8674..62ab20aa7360d1d1233894c1ef54bbeacb7325b0 100644 +index e861de3a552a0ad5719f910a398898396e7d8674..3e157449e7040a267fd9f0c12fcb8463a41f4b7b 100644 --- a/chrome/android/java/AndroidManifest.xml +++ b/chrome/android/java/AndroidManifest.xml @@ -28,6 +28,7 @@ by a child template that "extends" this file. @@ -79,23 +79,7 @@ index e861de3a552a0ad5719f910a398898396e7d8674..62ab20aa7360d1d1233894c1ef54bbea -@@ -888,6 +903,7 @@ by a child template that "extends" this file. - - - -@@ -900,6 +916,7 @@ by a child template that "extends" this file. - - - -@@ -1183,6 +1200,7 @@ by a child template that "extends" this file. +@@ -1183,6 +1198,7 @@ by a child template that "extends" this file. android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize" > @@ -103,7 +87,7 @@ index e861de3a552a0ad5719f910a398898396e7d8674..62ab20aa7360d1d1233894c1ef54bbea {% block extra_application_definitions %} {% endblock %} {% endmacro %} -@@ -1254,6 +1272,7 @@ by a child template that "extends" this file. +@@ -1254,6 +1270,7 @@ by a child template that "extends" this file.