Close site settings pages

android/brave_java_sources.gni

@@ -162,6 +162,7 @@ brave_java_sources = [
   "../../brave/android/java/org/chromium/chrome/browser/shields/BraveShieldsUtils.java",
   "../../brave/android/java/org/chromium/chrome/browser/shields/ShieldsTooltipEnum.java",
   "../../brave/android/java/org/chromium/chrome/browser/signin/BraveSigninManager.java",
+  "../../brave/android/java/org/chromium/chrome/browser/site_settings/BraveSiteSettingsDelegate.java",
   "../../brave/android/java/org/chromium/chrome/browser/site_settings/DesktopModePreferences.java",
   "../../brave/android/java/org/chromium/chrome/browser/site_settings/PlayYTVideoInBrowserPreferences.java",
   "../../brave/android/java/org/chromium/chrome/browser/suggestions/tile/BraveTileView.java",
@@ -241,7 +242,10 @@ if (enable_brave_sync) {
   ]
 }
 
-brave_components_browser_ui_site_settings_android_java = [ "//brave/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/BraveSiteSettingsPreferencesBase.java" ]
+brave_components_browser_ui_site_settings_android_java = [ 
+  "//brave/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/BraveSingleCategorySettings.java",
+  "//brave/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/BraveSiteSettingsPreferencesBase.java",
+]
 
 brave_browser_ui_android_appmenu_internal_sources = [ "//brave/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/BraveAppMenu.java" ]
 

android/java/apk_for_test.flags

@@ -229,3 +229,19 @@
 -keep class org.chromium.chrome.browser.tasks.tab_management.BraveTabGroupUiCoordinator {
     public <init>(...);
 }
+
+-keep class org.chromium.chrome.browser.site_settings.BraveSiteSettingsDelegate {
+    public <init>(...);
+}
+
+-keep class org.chromium.chrome.browser.site_settings.BraveSingleCategorySettings {
+    public <init>(...);
+}
+
+-keep class org.chromium.components.browser_ui.site_settings.SingleCategorySettings {
+    public <init>(...);
+}
+
+-keep class org.chromium.chrome.browser.site_settings.ChromeSiteSettingsDelegate {
+    public <init>(...);
+} 

android/java/org/chromium/chrome/browser/site_settings/BraveSiteSettingsDelegate.java

@@ -0,0 +1,29 @@
+/* Copyright (c) 2021 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.site_settings;
+
+import android.content.Context;
+import android.content.Intent;
+
+import org.chromium.chrome.browser.site_settings.ChromeSiteSettingsDelegate;
+import org.chromium.chrome.browser.app.BraveActivity;
+import org.chromium.chrome.browser.ChromeTabbedActivity;
+import org.chromium.components.embedder_support.browser_context.BrowserContextHandle;
+
+
+public class BraveSiteSettingsDelegate extends ChromeSiteSettingsDelegate {
+	public BraveSiteSettingsDelegate(Context context, BrowserContextHandle browserContextHandle) {
+		super(context, browserContextHandle);
+	}
+
+    @Override
+    public void closeButton() {
+        Intent intent = new Intent(BraveActivity.getChromeTabbedActivity(), ChromeTabbedActivity.class);
+        intent.addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
+        BraveActivity.getChromeTabbedActivity().startActivity(intent);
+    }
+}
+

android/javatests/org/chromium/chrome/browser/BytecodeTest.java

@@ -135,6 +135,12 @@ public void testClassesExist() throws Exception {
                 "org/chromium/chrome/browser/tasks/tab_management/TabGroupUiCoordinator"));
         Assert.assertTrue(classExists(
                 "org/chromium/chrome/browser/tasks/tab_management/BraveTabGroupUiCoordinator"));
+        Assert.assertTrue(classExists(
+                "org/chromium/chrome/browser/site_settings/BraveSiteSettingsDelegate"));
+        Assert.assertTrue(classExists(
+                "org/chromium/chrome/browser/site_settings/ChromeSiteSettingsDelegate"));
+        Assert.assertTrue(classExists(
+                "org/chromium/components/browser_ui/site_settings/SingleCategorySettings"));
     }
 
     @Test
@@ -268,6 +274,11 @@ public void testConstructorsExistAndMatch() throws Exception {
                 "org/chromium/chrome/browser/tasks/tab_management/BraveTabGroupUiCoordinator",
                 ViewGroup.class, ThemeColorProvider.class, ScrimCoordinator.class,
                 ObservableSupplier.class));
+        Assert.assertTrue(
+                constructorsMatch("org/chromium/chrome/browser/site_settings/ChromeSiteSettingsDelegate",
+                "org/chromium/chrome/browser/site_settings/BraveSiteSettingsDelegate",
+                Context.class, BrowserContextHandle.class
+                ));
     }
 
     @Test

build/android/bytecode/BUILD.gn

@@ -31,6 +31,8 @@ java_binary("java_bytecode_rewriter") {
     "//brave/build/android/bytecode/java/org/brave/bytecode/BraveQueryTileSectionClassAdapter.java",
     "//brave/build/android/bytecode/java/org/brave/bytecode/BraveSearchEngineAdapterClassAdapter.java",
     "//brave/build/android/bytecode/java/org/brave/bytecode/BraveSettingsLauncherImplClassAdapter.java",
+    "//brave/build/android/bytecode/java/org/brave/bytecode/BraveSingleCategorySettingsClassAdapter.java",
+    "//brave/build/android/bytecode/java/org/brave/bytecode/BraveSiteSettingsDelegateClassAdapter.java",
     "//brave/build/android/bytecode/java/org/brave/bytecode/BraveTabSwitcherModeTTCoordinatorPhoneClassAdapter.java",
     "//brave/build/android/bytecode/java/org/brave/bytecode/BraveTabSwitcherModeTTPhoneClassAdapter.java",
     "//brave/build/android/bytecode/java/org/brave/bytecode/BraveTabbedActivityClassAdapter.java",

build/android/bytecode/bytecode_rewriter.gni

@@ -5,8 +5,10 @@ brave_bytecode_jars = [
   "obj/chrome/android/chrome_java.javac.jar",
   "obj/chrome/android/features/tab_ui/java.javac.jar",
   "obj/chrome/browser/safe_browsing/android/java.javac.jar",
-  "obj/chrome/browser/ui/android/appmenu/internal/java.javac.jar",
+  "obj/chrome/browser/site_settings/android/java.javac.jar",
   "obj/chrome/browser/ui/android/toolbar/java.javac.jar",
+  "obj/chrome/browser/ui/android/appmenu/internal/java.javac.jar",
+  "obj/components/browser_ui/site_settings/android/java.javac.jar",
   "obj/components/external_intents/android/java.javac.jar",
   "obj/components/sync/android/sync_java.javac.jar",
 ]

build/android/bytecode/java/org/brave/bytecode/BraveClassAdapter.java

@@ -30,6 +30,8 @@ public static ClassVisitor createAdapter(ClassVisitor chain) {
         chain = new BraveQueryTileSectionClassAdapter(chain);
         chain = new BraveSearchEngineAdapterClassAdapter(chain);
         chain = new BraveSettingsLauncherImplClassAdapter(chain);
+        chain = new BraveSingleCategorySettingsClassAdapter(chain);
+        chain = new BraveSiteSettingsDelegateClassAdapter(chain);
         chain = new BraveTabbedActivityClassAdapter(chain);
         chain = new BraveTabGroupUiCoordinatorClassAdapter(chain);
         chain = new BraveTabSwitcherModeTTCoordinatorPhoneClassAdapter(chain);

build/android/bytecode/java/org/brave/bytecode/BraveSingleCategorySettingsClassAdapter.java

@@ -0,0 +1,19 @@
+/* Copyright (c) 2021 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 BraveSingleCategorySettingsClassAdapter extends BraveClassVisitor {
+    static String sSingleCategorySettingsClassName = "org/chromium/components/browser_ui/site_settings/SingleCategorySettings";
+    static String sBraveSingleCategorySettingsClassName = "org/chromium/components/browser_ui/site_settings/BraveSingleCategorySettings";
+
+    public BraveSingleCategorySettingsClassAdapter(ClassVisitor visitor) {
+        super(visitor);
+
+        changeSuperName(sSingleCategorySettingsClassName, sBraveSingleCategorySettingsClassName);
+    }
+}

build/android/bytecode/java/org/brave/bytecode/BraveSiteSettingsDelegateClassAdapter.java

@@ -0,0 +1,20 @@
+/* Copyright (c) 2021 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 BraveSiteSettingsDelegateClassAdapter extends BraveClassVisitor {
+
+    static String sChromeSiteSettingsDelegateClassName = "org/chromium/chrome/browser/site_settings/ChromeSiteSettingsDelegate";
+    static String sBraveSiteSettingsDelegateClassName = "org/chromium/chrome/browser/site_settings/BraveSiteSettingsDelegate";
+
+    public BraveSiteSettingsDelegateClassAdapter(ClassVisitor visitor) {
+        super(visitor);
+
+        redirectConstructor(sChromeSiteSettingsDelegateClassName, sBraveSiteSettingsDelegateClassName);
+    }
+}

components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/BraveSingleCategorySettings.java

@@ -0,0 +1,25 @@
+/* Copyright (c) 2021 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.components.browser_ui.site_settings;
+
+import android.os.Bundle;
+import android.view.MenuItem;
+
+import org.chromium.components.browser_ui.site_settings.SiteSettingsPreferenceFragment;
+
+public class BraveSingleCategorySettings extends SiteSettingsPreferenceFragment {
+
+    @Override
+    public void onCreatePreferences(Bundle savedInstanceState, String rootKey) { }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == R.id.close_menu_id) {
+            getSiteSettingsDelegate().closeButton();
+        }
+		return super.onOptionsItemSelected(item);
+    }
+}