commit 47e8fbbceed03f8ed168acccd2c3868ec6d38b22
author TreeHugger Robot <treehugger-gerrit@google.com> Sat Mar 16 02:54:25 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Mar 16 02:54:25 2019 +0000
tree 3e97c6a20592919e153ed4438bf6bb3b1d000fe3
parent bf04e65d3934cc83449f40618027efe756452d6c
parent 99644e20989af71986de937caff0f7874000697b

Merge "Choose a pref key less likely to conflict"

res/xml/app_notification_settings.xml

diff --git a/res/xml/app_notification_settings.xml b/res/xml/app_notification_settings.xml
index 54d6fe7..faad649 100644
--- a/res/xml/app_notification_settings.xml
+++ b/res/xml/app_notification_settings.xml
@@ -61,7 +61,7 @@
             android:order="1001"
             settings:restrictedSwitchSummary="@string/enabled_by_admin" />
         <com.android.settingslib.RestrictedSwitchPreference
-            android:key="bubble"
+            android:key="bubble_pref"
             android:title="@string/notification_bubbles_title"
             android:order="1002"
             settings:restrictedSwitchSummary="@string/enabled_by_admin" />

res/xml/channel_notification_settings.xml

diff --git a/res/xml/channel_notification_settings.xml b/res/xml/channel_notification_settings.xml
index 6015f7f..3158819 100644
--- a/res/xml/channel_notification_settings.xml
+++ b/res/xml/channel_notification_settings.xml
@@ -95,7 +95,7 @@
             settings:restrictedSwitchSummary="@string/enabled_by_admin"/>
 
         <com.android.settingslib.RestrictedSwitchPreference
-            android:key="bubble"
+            android:key="bubble_pref"
             android:title="@string/notification_bubbles_title"
             android:order="16"
             settings:restrictedSwitchSummary="@string/enabled_by_admin" />

src/com/android/settings/notification/BubblePreferenceController.java

diff --git a/src/com/android/settings/notification/BubblePreferenceController.java b/src/com/android/settings/notification/BubblePreferenceController.java
index e61de4b..5b3be44 100644
--- a/src/com/android/settings/notification/BubblePreferenceController.java
+++ b/src/com/android/settings/notification/BubblePreferenceController.java
@@ -30,7 +30,7 @@
         implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener {
 
     private static final String TAG = "BubblePrefContr";
-    private static final String KEY = "bubble";
+    private static final String KEY = "bubble_pref";
     private static final int SYSTEM_WIDE_ON = 1;
     private static final int SYSTEM_WIDE_OFF = 0;