diff --git a/common/common-vendor.mk b/common/common-vendor.mk
index 16b1ef4..723d9e5 100644
--- a/common/common-vendor.mk
+++ b/common/common-vendor.mk
@@ -36,4 +36,4 @@ PRODUCT_PACKAGES += \
 endif
 
 PRODUCT_SOONG_NAMESPACES += vendor/gapps/overlay
-PRODUCT_PACKAGES += GmsOverlay GmsSettingsProviderOverlay GmsSetupWizardOverlay
+PRODUCT_PACKAGES += GmsOverlay GmsSettingsOverlay GmsSettingsProviderOverlay GmsSetupWizardOverlay
diff --git a/overlay/GmsSettingsOverlay/Android.bp b/overlay/GmsSettingsOverlay/Android.bp
new file mode 100644
index 0000000..6e6cf6d
--- /dev/null
+++ b/overlay/GmsSettingsOverlay/Android.bp
@@ -0,0 +1,4 @@
+runtime_resource_overlay {
+    name: "GmsSettingsOverlay",
+    product_specific: true
+}
diff --git a/overlay/GmsSettingsOverlay/AndroidManifest.xml b/overlay/GmsSettingsOverlay/AndroidManifest.xml
new file mode 100644
index 0000000..79e6637
--- /dev/null
+++ b/overlay/GmsSettingsOverlay/AndroidManifest.xml
@@ -0,0 +1,7 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.mtg.gmssettingsoverlay"
+    android:versionCode="1"
+    android:versionName="1.0">
+    <application android:hasCode="false" />
+    <overlay android:targetPackage="com.android.settings" android:priority="1337" android:isStatic="true" />
+</manifest>
diff --git a/overlay/GmsSettingsOverlay/apktool.yml b/overlay/GmsSettingsOverlay/apktool.yml
new file mode 100644
index 0000000..2cfcba2
--- /dev/null
+++ b/overlay/GmsSettingsOverlay/apktool.yml
@@ -0,0 +1,23 @@
+!!brut.androlib.apk.ApkInfo
+apkFileName: GmsSettingsOverlay.apk
+doNotCompress:
+- resources.arsc
+isFrameworkApk: false
+packageInfo:
+  forcedPackageId: '127'
+  renameManifestPackage: null
+resourcesAreCompressed: false
+sdkInfo:
+  minSdkVersion: '34'
+  targetSdkVersion: '34'
+sharedLibrary: false
+sparseResources: true
+unknownFiles: {}
+usesFramework:
+  ids:
+  - 1
+  tag: null
+version: 2.8.1
+versionInfo:
+  versionCode: '1'
+  versionName: '1.0'
diff --git a/overlay/GmsSettingsOverlay/res/values/config.xml b/overlay/GmsSettingsOverlay/res/values/config.xml
new file mode 100644
index 0000000..6dc38e4
--- /dev/null
+++ b/overlay/GmsSettingsOverlay/res/values/config.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- BT Slice EXTRA_INTENT. To support Settings 2 panel, BT slice can't use PendingIntent.send(). Therefore, here defines the Slice EXTRA_INTENT. -->
+    <string name="config_bt_slice_extra_intent" translatable="false">com.google.android.gms.nearby.discovery.EXTRA_INTENT</string>
+
+    <!-- BT Slice EXTRA_PENDING_INTENT. To support Settings 2 panel, BT slice can't use PendingIntent.send(). Therefore, here defines the Slice EXTRA_PENDING_INTENT. -->
+    <string name="config_bt_slice_extra_pending_intent" translatable="false">com.google.android.gms.nearby.discovery.EXTRA_PENDING_INTENT</string>
+
+    <!-- BT Slice intent action. To support Settings 2 panel, BT slice can't use PendingIntent.send(). Therefore, here defines the Slice intent action. -->
+    <string name="config_bt_slice_intent_action" translatable="false">com.google.android.gms.nearby.discovery.ACTION_LOG_SLICE_AND_LAUNCH_INTENT</string>
+
+    <!-- BT Slice pending intent action. To support Settings 2 panel, BT slice can't use PendingIntent.send(). Therefore, here defines the Slice pending intent action. -->
+    <string name="config_bt_slice_pending_intent_action" translatable="false">com.google.android.gms.nearby.discovery.ACTION_LOG_SLICE_AND_SEND_PENDING_INTENT</string>
+</resources>