Merge "Remove the xml for bubble pref in developer options" into rvc-dev
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 54525d5..897cfea 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -8197,8 +8197,6 @@
<!-- Configure Notifications: Title for the notification bubbles option. [CHAR LIMIT=60] -->
<string name="notification_bubbles_title">Bubbles</string>
- <!-- Developer setting summary for bubbles [CHAR LIMIT=NONE] -->
- <string name="notification_bubbles_developer_setting_summary">Some notifications can appear as bubbles on the screen</string>
<!-- Feature education for bubbles. [CHAR LIMIT=NONE] -->
<string name="bubbles_feature_education">Some notifications and other content can appear as bubbles on the screen. To open a bubble, tap it. To dismiss it, drag it down the screen.</string>
<!-- Title for the toggle shown on the app-level bubbles page [CHAR LIMIT=60] -->
diff --git a/res/xml/development_settings.xml b/res/xml/development_settings.xml
index d1473e5..2420b03 100644
--- a/res/xml/development_settings.xml
+++ b/res/xml/development_settings.xml
@@ -638,12 +638,6 @@
<Preference
android:key="reset_shortcut_manager_throttling"
android:title="@string/reset_shortcut_manager_throttling" />
-
- <SwitchPreference
- android:key="notification_bubbles"
- android:title="@string/notification_bubbles_title"
- android:summary="@string/notification_bubbles_developer_setting_summary"/>
-
</PreferenceCategory>
<com.android.settings.development.autofill.AutofillPreferenceCategory