From 9ae7f8fe5f2b841df715a144e7865765d02d4506 Mon Sep 17 00:00:00 2001
From: Ido Ben-Hur <idoybh2@gmail.com>
Date: Thu, 11 Apr 2024 21:51:51 +0300
Subject: [PATCH] Settings: Export an activity for private DNS settings

For the DNS tile long press intent in base
---
 AndroidManifest.xml                           | 19 +++++++++++++++++++
 src/com/android/settings/Settings.java        |  2 ++
 .../core/gateway/SettingsGateway.java         |  4 ++++
 3 files changed, 25 insertions(+)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 7671d17a271..14b45c49194 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -986,6 +986,25 @@
                 android:value="true" />
         </activity>
 
+        <activity
+            android:name="Settings$PrivateDnsSettingsActivity"
+            android:label="@string/select_private_dns_configuration_title"
+            android:exported="true"
+            android:icon="@drawable/ic_settings_private_dns">
+            <intent-filter>
+                <action android:name="com.android.settings.PRIVATE_DNS_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <intent-filter android:priority="4">
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="com.android.settings.SHORTCUT" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                android:value="com.android.settings.network.PrivateDnsSettings" />
+            <meta-data android:name="com.android.settings.HIGHLIGHT_MENU_KEY"
+                       android:value="@string/menu_key_network"/>
+        </activity>
+
         <activity
             android:name="Settings$DataSaverSummaryActivity"
             android:exported="true"
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index 3154b47d3b7..91762cf7e83 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -539,4 +539,6 @@ public class Settings extends SettingsActivity {
     public static class ContentProtectionSettingsActivity extends SettingsActivity { /* empty */ }
     public static class MagnificationActivity extends SettingsActivity { /* empty */ }
     public static class FlashNotificationsActivity extends SettingsActivity { /* empty */ }
+
+    public static class PrivateDnsSettingsActivity extends SettingsActivity { /* empty */ }
 }
diff --git a/src/com/android/settings/core/gateway/SettingsGateway.java b/src/com/android/settings/core/gateway/SettingsGateway.java
index 6fa0dceee0b..000f5f474cf 100644
--- a/src/com/android/settings/core/gateway/SettingsGateway.java
+++ b/src/com/android/settings/core/gateway/SettingsGateway.java
@@ -148,6 +148,7 @@ import com.android.settings.location.WifiScanningFragment;
 import com.android.settings.network.MobileNetworkListFragment;
 import com.android.settings.network.NetworkDashboardFragment;
 import com.android.settings.network.NetworkProviderSettings;
+import com.android.settings.network.PrivateDnsSettings;
 import com.android.settings.network.apn.ApnEditor;
 import com.android.settings.network.apn.ApnSettings;
 import com.android.settings.network.telephony.CellularSecuritySettingsFragment;
@@ -425,6 +426,7 @@ public class SettingsGateway {
             ContentProtectionPreferenceFragment.class.getName(),
             ToggleScreenMagnificationPreferenceFragment.class.getName(),
             FlashNotificationsPreferenceFragment.class.getName(),
+            PrivateDnsSettings.class.getName(),
     };
 
     public static final String[] SETTINGS_FOR_RESTRICTED = {
@@ -472,5 +474,7 @@ public class SettingsGateway {
             UserBackupSettingsActivity.class.getName(),
             Settings.MemtagPageActivity.class.getName(),
             Settings.NavigationModeSettingsActivity.class.getName(),
+            // Others (Evolution X Additions)
+            Settings.PrivateDnsSettingsActivity.class.getName(),
     };
 }