From 59cd3cc3f0bf06a0984e493650908fcb4a47e0a1 Mon Sep 17 00:00:00 2001
From: Deep <deeppandya91@gmail.com>
Date: Mon, 29 Aug 2022 14:11:01 -0400
Subject: [PATCH] Remove activity alias and add new activity

---
 android/brave_java_sources.gni                |  1 +
 android/java/AndroidManifest.xml              |  8 ++++----
 .../SearchWidgetProviderActivity.java         | 19 +++++++++++++++++++
 3 files changed, 24 insertions(+), 4 deletions(-)
 create mode 100644 android/java/org/chromium/chrome/browser/searchwidget/SearchWidgetProviderActivity.java

diff --git a/android/brave_java_sources.gni b/android/brave_java_sources.gni
index 8b4bcdd9b84..38624349d54 100644
--- a/android/brave_java_sources.gni
+++ b/android/brave_java_sources.gni
@@ -257,6 +257,7 @@ brave_java_sources = [
   "../../brave/android/java/org/chromium/chrome/browser/rate/RateUtils.java",
   "../../brave/android/java/org/chromium/chrome/browser/rewards/BraveRewardsPanel.java",
   "../../brave/android/java/org/chromium/chrome/browser/safe_browsing/settings/BraveStandardProtectionSettingsFragment.java",
+  "../../brave/android/java/org/chromium/chrome/browser/searchwidget/SearchWidgetProviderActivity.java",
   "../../brave/android/java/org/chromium/chrome/browser/set_default_browser/BraveSetDefaultBrowserUtils.java",
   "../../brave/android/java/org/chromium/chrome/browser/set_default_browser/OnBraveSetDefaultBrowserListener.java",
   "../../brave/android/java/org/chromium/chrome/browser/set_default_browser/SetDefaultBrowserBottomSheetFragment.java",
diff --git a/android/java/AndroidManifest.xml b/android/java/AndroidManifest.xml
index cf802d6dcec..1afdef5add7 100644
--- a/android/java/AndroidManifest.xml
+++ b/android/java/AndroidManifest.xml
@@ -188,7 +188,7 @@
     </intent-filter>
 </service>
 
-<!-- This activity alias is for search provider widget -->
-<activity-alias android:name="org.chromium.chrome.browser.searchwidget.SearchWidgetProviderActivity"
-    android:targetActivity="org.chromium.chrome.browser.searchwidget.SearchActivity"
-    android:exported="true" />
+<!-- This activity is used for search provider widget -->
+<activity android:name="org.chromium.chrome.browser.searchwidget.SearchWidgetProviderActivity"
+    android:theme="@style/Theme.Chromium.SearchActivity"
+    android:exported="true"/>
\ No newline at end of file
diff --git a/android/java/org/chromium/chrome/browser/searchwidget/SearchWidgetProviderActivity.java b/android/java/org/chromium/chrome/browser/searchwidget/SearchWidgetProviderActivity.java
new file mode 100644
index 00000000000..a4f52e9e754
--- /dev/null
+++ b/android/java/org/chromium/chrome/browser/searchwidget/SearchWidgetProviderActivity.java
@@ -0,0 +1,19 @@
+/**
+ * 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.searchwidget;
+
+import android.content.Intent;
+
+import org.chromium.chrome.browser.searchwidget.SearchActivity;
+
+public class SearchWidgetProviderActivity extends SearchActivity {
+    @Override
+    public void onNewIntent(Intent intent) {
+        super.onNewIntent(intent);
+    }
+}