From 99644e20989af71986de937caff0f7874000697b Mon Sep 17 00:00:00 2001 From: Julia Reynolds Date: Fri, 15 Mar 2019 14:15:55 -0400 Subject: [PATCH] Choose a pref key less likely to conflict Test: manual Fixes: 127498706 Change-Id: I254cef727df137abac5810f19e63449a7f582876 --- res/xml/app_notification_settings.xml | 2 +- res/xml/channel_notification_settings.xml | 2 +- .../settings/notification/BubblePreferenceController.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/res/xml/app_notification_settings.xml b/res/xml/app_notification_settings.xml index 54d6fe7dcaf..faad649a7ab 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" /> diff --git a/res/xml/channel_notification_settings.xml b/res/xml/channel_notification_settings.xml index 94a2cdb3d2c..45c8b1ada59 100644 --- a/res/xml/channel_notification_settings.xml +++ b/res/xml/channel_notification_settings.xml @@ -87,7 +87,7 @@ settings:restrictedSwitchSummary="@string/enabled_by_admin"/> diff --git a/src/com/android/settings/notification/BubblePreferenceController.java b/src/com/android/settings/notification/BubblePreferenceController.java index e61de4ba40f..5b3be440622 100644 --- a/src/com/android/settings/notification/BubblePreferenceController.java +++ b/src/com/android/settings/notification/BubblePreferenceController.java @@ -30,7 +30,7 @@ public class BubblePreferenceController extends NotificationPreferenceController 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;