Discharge7443/brave-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert removing widgets (#16904)

Browse Source
This commit is contained in:
Deep Pandya
2023-01-28 16:23:46 -05:00
committed by GitHub
parent cd3efcdd79
commit 2ffd9b6686
8 changed files with 3 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/brave_java_sources.gni
-1
View File
@@ -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",
android/java/apk_for_test.flags
-13
View File
@@ -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 <init>(...);
}
android/java/org/chromium/chrome/browser/quickactionsearchwidget/BraveQuickActionSearchWidgetProvider.java
-26
View File
@@ -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<? extends QuickActionSearchWidgetProvider> component,
boolean shouldEnableWidgetComponent) {
assert false : "setWidgetComponentEnabled should be redirected to parent in bytecode!";
}
}
android/javatests/org/chromium/chrome/browser/BytecodeTest.java
-14
View File
@@ -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));
build/android/bytecode/BUILD.gn
-1
View File
@@ -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",
build/android/bytecode/java/org/brave/bytecode/BraveClassAdapter.java
-1
View File
@@ -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);
build/android/bytecode/java/org/brave/bytecode/BraveQuickActionSearchWidgetProviderClassAdapter.java
-24
View File
@@ -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");
}
}
patches/chrome-android-java-AndroidManifest.xml.patch
+3 -19
View File
@@ -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
<meta-data android:name="android.app.searchable"
android:resource="@xml/searchable" />
</activity-alias>
@@ -888,6 +903,7 @@ by a child template that "extends" this file.
<receiver
android:name="org.chromium.chrome.browser.quickactionsearchwidget.QuickActionSearchWidgetProvider$QuickActionSearchWidgetProviderSearch"
android:label="@string/quick_action_search_widget_title"
+ android:enabled="false"
android:exported="true">
<intent-filter>
<action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
@@ -900,6 +916,7 @@ by a child template that "extends" this file.
<receiver
android:name="org.chromium.chrome.browser.quickactionsearchwidget.QuickActionSearchWidgetProvider$QuickActionSearchWidgetProviderDino"
android:label="@string/dino_widget_text"
+ android:enabled="false"
android:exported="true">
<intent-filter>
<action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
@@ -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" >
</activity>
@@ -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.
<!-- ARCore APK integration -->
<!-- This tag indicates that this application optionally uses ARCore. -->
<meta-data android:name="com.google.ar.core" android:value="optional" />