From e4b04b1bd188a41288010f456cd7793451f6bcdd Mon Sep 17 00:00:00 2001
From: Adriana Ixba <aixba@chromium.org>
Date: Wed, 13 Aug 2025 14:00:05 -0700
Subject: [PATCH 1/2] Add application_preferences to ManageDataLauncherActivity

---
 .../app/src/main/AndroidManifest.xml               | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/packages/core/template_project/app/src/main/AndroidManifest.xml b/packages/core/template_project/app/src/main/AndroidManifest.xml
index ba48b2536..43bb07863 100644
--- a/packages/core/template_project/app/src/main/AndroidManifest.xml
+++ b/packages/core/template_project/app/src/main/AndroidManifest.xml
@@ -91,10 +91,16 @@
         <% } %>
 
         <% if (enableSiteSettingsShortcut) { %>
-            <activity android:name="com.google.androidbrowserhelper.trusted.ManageDataLauncherActivity">
-            <meta-data
-                android:name="android.support.customtabs.trusted.MANAGE_SPACE_URL"
-                android:value="@string/launchUrl" />
+            <activity android:name="com.google.androidbrowserhelper.trusted.ManageDataLauncherActivity"
+                android:exported="false"
+                android:excludeFromRecents="true">
+                <meta-data
+                    android:name="android.support.customtabs.trusted.MANAGE_SPACE_URL"
+                    android:value="@string/launchUrl" />
+                <intent-filter>
+                    <action android:name="android.intent.action.APPLICATION_PREFERENCES" />
+                    <category android:name="android.intent.category.DEFAULT" />
+                </intent-filter>
             </activity>
         <% } %>
 

From 9d7e6f0f803fc28eb6e98b56d9e77d184823e43c Mon Sep 17 00:00:00 2001
From: Adriana Ixba <aixba@chromium.org>
Date: Tue, 23 Sep 2025 13:42:08 -0700
Subject: [PATCH 2/2] add enabled

---
 packages/core/template_project/app/src/main/AndroidManifest.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/core/template_project/app/src/main/AndroidManifest.xml b/packages/core/template_project/app/src/main/AndroidManifest.xml
index 43bb07863..8bfea471b 100644
--- a/packages/core/template_project/app/src/main/AndroidManifest.xml
+++ b/packages/core/template_project/app/src/main/AndroidManifest.xml
@@ -93,6 +93,7 @@
         <% if (enableSiteSettingsShortcut) { %>
             <activity android:name="com.google.androidbrowserhelper.trusted.ManageDataLauncherActivity"
                 android:exported="false"
+                android:enabled="true"
                 android:excludeFromRecents="true">
                 <meta-data
                     android:name="android.support.customtabs.trusted.MANAGE_SPACE_URL"