diff --git a/src/com/android/settings/notification/BubblePreferenceController.java b/src/com/android/settings/notification/BubblePreferenceController.java index b68f11db0c8..b57a91100a4 100644 --- a/src/com/android/settings/notification/BubblePreferenceController.java +++ b/src/com/android/settings/notification/BubblePreferenceController.java @@ -16,7 +16,7 @@ package com.android.settings.notification; -import static android.provider.Settings.Secure.NOTIFICATION_BUBBLES; +import static android.provider.Settings.Global.NOTIFICATION_BUBBLES; import android.annotation.Nullable; import android.content.Context; @@ -113,7 +113,7 @@ public class BubblePreferenceController extends NotificationPreferenceController } private boolean isGloballyEnabled() { - return Settings.Secure.getInt(mContext.getContentResolver(), + return Settings.Global.getInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_OFF) == SYSTEM_WIDE_ON; } @@ -124,7 +124,7 @@ public class BubblePreferenceController extends NotificationPreferenceController backend.setAllowBubbles(pkg, uid, false); // changing the global settings will cause the observer on the host page to reload // correct preference state - Settings.Secure.putInt(mContext.getContentResolver(), + Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_OFF); } @@ -134,7 +134,7 @@ public class BubblePreferenceController extends NotificationPreferenceController backend.setAllowBubbles(pkg, uid, true); // changing the global settings will cause the observer on the host page to reload // correct preference state - Settings.Secure.putInt(mContext.getContentResolver(), + Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON); } } diff --git a/src/com/android/settings/notification/BubbleSummaryPreferenceController.java b/src/com/android/settings/notification/BubbleSummaryPreferenceController.java index b1632c4d1e1..cc687cf107c 100644 --- a/src/com/android/settings/notification/BubbleSummaryPreferenceController.java +++ b/src/com/android/settings/notification/BubbleSummaryPreferenceController.java @@ -16,7 +16,7 @@ package com.android.settings.notification; -import static android.provider.Settings.Secure.NOTIFICATION_BUBBLES; +import static android.provider.Settings.Global.NOTIFICATION_BUBBLES; import android.app.settings.SettingsEnums; import android.content.Context; @@ -100,7 +100,7 @@ public class BubbleSummaryPreferenceController extends NotificationPreferenceCon } private boolean isGloballyEnabled() { - return Settings.Secure.getInt(mContext.getContentResolver(), + return Settings.Global.getInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_OFF) == SYSTEM_WIDE_ON; } } diff --git a/src/com/android/settings/notification/GentleNotificationsPreferenceController.java b/src/com/android/settings/notification/GentleNotificationsPreferenceController.java index ea16e726846..67a4707e4f4 100644 --- a/src/com/android/settings/notification/GentleNotificationsPreferenceController.java +++ b/src/com/android/settings/notification/GentleNotificationsPreferenceController.java @@ -16,8 +16,6 @@ package com.android.settings.notification; -import static android.provider.Settings.Secure.NOTIFICATION_BUBBLES; - import android.content.Context; import android.provider.Settings; diff --git a/src/com/android/settings/notification/GlobalBubblePermissionObserverMixin.java b/src/com/android/settings/notification/GlobalBubblePermissionObserverMixin.java index 398931dc518..0118a95deb2 100644 --- a/src/com/android/settings/notification/GlobalBubblePermissionObserverMixin.java +++ b/src/com/android/settings/notification/GlobalBubblePermissionObserverMixin.java @@ -47,8 +47,8 @@ public class GlobalBubblePermissionObserverMixin extends ContentObserver { public void onStart() { mContext.getContentResolver().registerContentObserver( - Settings.Secure.getUriFor( - Settings.Secure.NOTIFICATION_BUBBLES), + Settings.Global.getUriFor( + Settings.Global.NOTIFICATION_BUBBLES), false /* notifyForDescendants */, this /* observer */); } diff --git a/tests/robotests/src/com/android/settings/development/BubbleGlobalPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BubbleGlobalPreferenceControllerTest.java index 11ca63f58c1..9e52a8829c9 100644 --- a/tests/robotests/src/com/android/settings/development/BubbleGlobalPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BubbleGlobalPreferenceControllerTest.java @@ -16,7 +16,7 @@ package com.android.settings.development; -import static android.provider.Settings.Secure.NOTIFICATION_BUBBLES; +import static android.provider.Settings.Global.NOTIFICATION_BUBBLES; import static com.android.settings.development.BubbleGlobalPreferenceController.OFF; import static com.android.settings.development.BubbleGlobalPreferenceController.ON; @@ -77,7 +77,7 @@ public class BubbleGlobalPreferenceControllerTest { @Test public void updateState_settingEnabled_preferenceShouldBeChecked() { - Settings.Secure.putInt(mContext.getContentResolver(), + Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, 1 /* enabled */); mController.updateState(mPreference); @@ -86,7 +86,7 @@ public class BubbleGlobalPreferenceControllerTest { @Test public void updateState_settingReset_defaultDisabled_preferenceShouldNotBeChecked() { - Settings.Secure.putInt(mContext.getContentResolver(), + Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, 0 /* enabled */); mController.updateState(mPreference); @@ -104,7 +104,7 @@ public class BubbleGlobalPreferenceControllerTest { } private boolean isSettingEnabled() { - return Settings.Secure.getInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, + return Settings.Global.getInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, OFF /* default off */) == ON; } diff --git a/tests/robotests/src/com/android/settings/notification/BubblePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/BubblePreferenceControllerTest.java index aafefb51823..470cc27e6f2 100644 --- a/tests/robotests/src/com/android/settings/notification/BubblePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/BubblePreferenceControllerTest.java @@ -20,7 +20,7 @@ import static android.app.NotificationChannel.DEFAULT_CHANNEL_ID; import static android.app.NotificationManager.IMPORTANCE_HIGH; import static android.app.NotificationManager.IMPORTANCE_LOW; import static android.app.NotificationManager.IMPORTANCE_NONE; -import static android.provider.Settings.Secure.NOTIFICATION_BUBBLES; +import static android.provider.Settings.Global.NOTIFICATION_BUBBLES; import static com.android.settings.notification.BubblePreferenceController.SYSTEM_WIDE_OFF; import static com.android.settings.notification.BubblePreferenceController.SYSTEM_WIDE_ON; @@ -103,7 +103,7 @@ public class BubblePreferenceControllerTest { @Test public void testIsAvailable_notIfAppBlocked() { - Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON); + Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON); NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); appRow.banned = true; mController.onResume(appRow, mock(NotificationChannel.class), null, null); @@ -112,7 +112,7 @@ public class BubblePreferenceControllerTest { @Test public void testIsAvailable_notIfChannelBlocked() { - Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON); + Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON); NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); NotificationChannel channel = mock(NotificationChannel.class); when(channel.getImportance()).thenReturn(IMPORTANCE_NONE); @@ -122,7 +122,7 @@ public class BubblePreferenceControllerTest { @Test public void testIsAvailable_channel_notIfAppOff() { - Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON); + Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON); NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); appRow.allowBubbles = false; NotificationChannel channel = mock(NotificationChannel.class); @@ -136,7 +136,7 @@ public class BubblePreferenceControllerTest { public void testIsNotAvailable_ifOffGlobally_app() { NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); mController.onResume(appRow, null, null, null); - Settings.Secure.putInt(mContext.getContentResolver(), + Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_OFF); assertFalse(mController.isAvailable()); @@ -148,7 +148,7 @@ public class BubblePreferenceControllerTest { NotificationChannel channel = mock(NotificationChannel.class); when(channel.getImportance()).thenReturn(IMPORTANCE_HIGH); mController.onResume(appRow, channel, null, null); - Settings.Secure.putInt(mContext.getContentResolver(), + Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_OFF); assertFalse(mController.isAvailable()); @@ -158,7 +158,7 @@ public class BubblePreferenceControllerTest { public void testIsAvailable_app_evenIfOffGlobally() { NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); mAppPageController.onResume(appRow, null, null, null); - Settings.Secure.putInt(mContext.getContentResolver(), + Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_OFF); assertTrue(mAppPageController.isAvailable()); @@ -168,7 +168,7 @@ public class BubblePreferenceControllerTest { public void testIsAvailable_app() { NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); mController.onResume(appRow, null, null, null); - Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON); + Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON); assertTrue(mController.isAvailable()); } @@ -181,7 +181,7 @@ public class BubblePreferenceControllerTest { when(channel.getImportance()).thenReturn(IMPORTANCE_HIGH); when(channel.getId()).thenReturn(DEFAULT_CHANNEL_ID); mController.onResume(appRow, channel, null, null); - Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON); + Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON); assertTrue(mController.isAvailable()); } @@ -193,7 +193,7 @@ public class BubblePreferenceControllerTest { NotificationChannel channel = mock(NotificationChannel.class); when(channel.getImportance()).thenReturn(IMPORTANCE_HIGH); mController.onResume(appRow, channel, null, null); - Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON); + Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON); assertTrue(mController.isAvailable()); } @@ -205,7 +205,7 @@ public class BubblePreferenceControllerTest { NotificationChannel channel = mock(NotificationChannel.class); when(channel.getImportance()).thenReturn(IMPORTANCE_HIGH); mController.onResume(appRow, channel, null, null); - Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON); + Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON); assertFalse(mController.isAvailable()); } @@ -225,7 +225,7 @@ public class BubblePreferenceControllerTest { @Test public void testUpdateState_channelNotBlockable() { - Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON); + Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON); NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); NotificationChannel channel = mock(NotificationChannel.class); when(channel.isImportanceLockedByCriticalDeviceFunction()).thenReturn(true); @@ -239,7 +239,7 @@ public class BubblePreferenceControllerTest { @Test public void testUpdateState_channel() { - Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON); + Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON); NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); NotificationChannel channel = mock(NotificationChannel.class); when(channel.canBubble()).thenReturn(true); @@ -259,7 +259,7 @@ public class BubblePreferenceControllerTest { @Test public void testUpdateState_app() { - Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON); + Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON); NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); appRow.label = "App!"; appRow.allowBubbles = true; @@ -281,7 +281,7 @@ public class BubblePreferenceControllerTest { @Test public void testUpdateState_app_offGlobally() { - Settings.Secure.putInt(mContext.getContentResolver(), + Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_OFF); NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); appRow.label = "App!"; @@ -295,7 +295,7 @@ public class BubblePreferenceControllerTest { @Test public void testOnPreferenceChange_on_channel() { - Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON); + Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON); NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); appRow.allowBubbles = true; NotificationChannel channel = @@ -315,7 +315,7 @@ public class BubblePreferenceControllerTest { @Test public void testOnPreferenceChange_off_channel() { - Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON); + Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON); NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); appRow.allowBubbles = true; NotificationChannel channel = @@ -335,7 +335,7 @@ public class BubblePreferenceControllerTest { @Test public void testOnPreferenceChange_on_app() { - Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON); + Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON); NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); appRow.allowBubbles = false; mController.onResume(appRow, null, null, null); @@ -353,7 +353,7 @@ public class BubblePreferenceControllerTest { @Test public void testOnPreferenceChange_off_app() { - Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON); + Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON); NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); appRow.allowBubbles = true; mController.onResume(appRow, null, null, null); @@ -371,7 +371,7 @@ public class BubblePreferenceControllerTest { @Test public void testOnPreferenceChange_on_app_offGlobally() { - Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, + Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_OFF); NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); appRow.allowBubbles = false; diff --git a/tests/robotests/src/com/android/settings/notification/BubbleSummaryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/BubbleSummaryPreferenceControllerTest.java index 04c8e4e985b..2710203c143 100644 --- a/tests/robotests/src/com/android/settings/notification/BubbleSummaryPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/BubbleSummaryPreferenceControllerTest.java @@ -20,7 +20,7 @@ import static android.app.NotificationChannel.DEFAULT_CHANNEL_ID; import static android.app.NotificationManager.IMPORTANCE_HIGH; import static android.app.NotificationManager.IMPORTANCE_LOW; import static android.app.NotificationManager.IMPORTANCE_NONE; -import static android.provider.Settings.Secure.NOTIFICATION_BUBBLES; +import static android.provider.Settings.Global.NOTIFICATION_BUBBLES; import static com.android.settings.notification.BubbleSummaryPreferenceController.SYSTEM_WIDE_OFF; import static com.android.settings.notification.BubbleSummaryPreferenceController.SYSTEM_WIDE_ON; @@ -98,7 +98,7 @@ public class BubbleSummaryPreferenceControllerTest { NotificationChannel channel = mock(NotificationChannel.class); when(channel.getImportance()).thenReturn(IMPORTANCE_HIGH); mController.onResume(appRow, channel, null, null); - Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, + Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_OFF); assertFalse(mController.isAvailable()); @@ -108,7 +108,7 @@ public class BubbleSummaryPreferenceControllerTest { public void testIsAvailable_app() { NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); mController.onResume(appRow, null, null, null); - Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON); + Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON); assertTrue(mController.isAvailable()); } @@ -117,7 +117,7 @@ public class BubbleSummaryPreferenceControllerTest { public void testIsNotAvailable_app_globalOff() { NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); mController.onResume(appRow, null, null, null); - Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, + Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_OFF); assertFalse(mController.isAvailable()); @@ -131,7 +131,7 @@ public class BubbleSummaryPreferenceControllerTest { when(channel.getImportance()).thenReturn(IMPORTANCE_HIGH); when(channel.getId()).thenReturn(DEFAULT_CHANNEL_ID); mController.onResume(appRow, channel, null, null); - Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON); + Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON); assertTrue(mController.isAvailable()); } @@ -149,18 +149,18 @@ public class BubbleSummaryPreferenceControllerTest { @Test public void testGetSummary() { - Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON); + Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON); NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); appRow.allowBubbles = true; mController.onResume(appRow, null, null, null); assertEquals("On", mController.getSummary()); - Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, + Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_OFF); assertEquals("Off", mController.getSummary()); - Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON); + Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON); appRow.allowBubbles = false; mController.onResume(appRow, null, null, null); diff --git a/tests/robotests/src/com/android/settings/notification/GentleNotificationsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/GentleNotificationsPreferenceControllerTest.java index 4821322cff7..bd013799416 100644 --- a/tests/robotests/src/com/android/settings/notification/GentleNotificationsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/GentleNotificationsPreferenceControllerTest.java @@ -16,8 +16,6 @@ package com.android.settings.notification; -import static android.provider.Settings.Secure.NOTIFICATION_BUBBLES; - import static com.android.settings.notification.BadgingNotificationPreferenceController.OFF; import static com.android.settings.notification.BadgingNotificationPreferenceController.ON;