From 22c920cc0168bee0c6153d1cf51a86ed4dccc1f6 Mon Sep 17 00:00:00 2001 From: Mady Mellor Date: Thu, 18 Jul 2019 14:13:05 -0700 Subject: [PATCH] Use the Global value rather than the Secure value Fixes: 137876221 Test: manual - have setting in dev options turned off, post a bubble => no bubble appears - have setting in dev options turned on, post a bubble => bubble appears Change-Id: I4490b978059a73b45fa8d09bf28e05965f42eec1 --- .../development/BubbleGlobalPreferenceController.java | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/com/android/settings/development/BubbleGlobalPreferenceController.java b/src/com/android/settings/development/BubbleGlobalPreferenceController.java index 86d7be1046..2f22d098f4 100644 --- a/src/com/android/settings/development/BubbleGlobalPreferenceController.java +++ b/src/com/android/settings/development/BubbleGlobalPreferenceController.java @@ -16,8 +16,6 @@ package com.android.settings.development; -import static android.provider.Settings.Secure.NOTIFICATION_BUBBLES; - import android.content.Context; import android.provider.Settings; @@ -42,7 +40,7 @@ public class BubbleGlobalPreferenceController extends DeveloperOptionsPreference @Override public String getPreferenceKey() { - return NOTIFICATION_BUBBLES; + return Settings.Global.NOTIFICATION_BUBBLES; } @Override @@ -64,12 +62,12 @@ public class BubbleGlobalPreferenceController extends DeveloperOptionsPreference } private boolean isEnabled() { - return Settings.Secure.getInt(mContext.getContentResolver(), - NOTIFICATION_BUBBLES, OFF) == ON; + return Settings.Global.getInt(mContext.getContentResolver(), + Settings.Global.NOTIFICATION_BUBBLES, OFF) == ON; } private void writeSetting(boolean isEnabled) { - Settings.Secure.putInt(mContext.getContentResolver(), - NOTIFICATION_BUBBLES, isEnabled ? ON : OFF); + Settings.Global.putInt(mContext.getContentResolver(), + Settings.Global.NOTIFICATION_BUBBLES, isEnabled ? ON : OFF); } } -- 2.11.0