From 3e2afb6ef788dd80a619e467773490a1886d74cf Mon Sep 17 00:00:00 2001 From: Dan Sandler Date: Tue, 22 Jul 2014 23:15:17 -0400 Subject: Track moved Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS. Bug: 15331132 Change-Id: Ia80ccb2cfdf60116bd50601e60ff131619eafcc5 --- .../android/settings/notification/NotificationSettings.java | 10 +++++----- .../android/settings/notification/RedactionInterstitial.java | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'src/com') diff --git a/src/com/android/settings/notification/NotificationSettings.java b/src/com/android/settings/notification/NotificationSettings.java index 4b5718b..2b0fd5c 100644 --- a/src/com/android/settings/notification/NotificationSettings.java +++ b/src/com/android/settings/notification/NotificationSettings.java @@ -318,8 +318,8 @@ public class NotificationSettings extends SettingsPreferenceFragment implements final boolean show = val == R.string.lock_screen_notifications_summary_show; Settings.Secure.putInt(getContentResolver(), Settings.Secure.LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS, show ? 1 : 0); - Settings.Global.putInt(getContentResolver(), - Settings.Global.LOCK_SCREEN_SHOW_NOTIFICATIONS, enabled ? 1 : 0); + Settings.Secure.putInt(getContentResolver(), + Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS, enabled ? 1 : 0); return true; } }); @@ -338,8 +338,8 @@ public class NotificationSettings extends SettingsPreferenceFragment implements } private boolean getLockscreenNotificationsEnabled() { - return Settings.Global.getInt(getContentResolver(), - Settings.Global.LOCK_SCREEN_SHOW_NOTIFICATIONS, 0) != 0; + return Settings.Secure.getInt(getContentResolver(), + Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS, 0) != 0; } private boolean getLockscreenAllowPrivateNotifications() { @@ -378,7 +378,7 @@ public class NotificationSettings extends SettingsPreferenceFragment implements private final Uri LOCK_SCREEN_PRIVATE_URI = Settings.Secure.getUriFor(Settings.Secure.LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS); private final Uri LOCK_SCREEN_SHOW_URI = - Settings.Global.getUriFor(Settings.Global.LOCK_SCREEN_SHOW_NOTIFICATIONS); + Settings.Secure.getUriFor(Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS); public SettingsObserver() { super(mHandler); diff --git a/src/com/android/settings/notification/RedactionInterstitial.java b/src/com/android/settings/notification/RedactionInterstitial.java index f122188..773f3af 100644 --- a/src/com/android/settings/notification/RedactionInterstitial.java +++ b/src/com/android/settings/notification/RedactionInterstitial.java @@ -79,8 +79,8 @@ public class RedactionInterstitial extends SettingsActivity { } private void loadFromSettings() { - final boolean enabled = Settings.Global.getInt(getContentResolver(), - Settings.Global.LOCK_SCREEN_SHOW_NOTIFICATIONS, 0) != 0; + final boolean enabled = Settings.Secure.getInt(getContentResolver(), + Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS, 0) != 0; final boolean show = Settings.Secure.getInt(getContentResolver(), Settings.Secure.LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS, 0) != 0; mShowAllButton.setChecked(enabled && show); @@ -95,8 +95,8 @@ public class RedactionInterstitial extends SettingsActivity { Settings.Secure.putInt(getContentResolver(), Settings.Secure.LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS, show ? 1 : 0); - Settings.Global.putInt(getContentResolver(), - Settings.Global.LOCK_SCREEN_SHOW_NOTIFICATIONS, enabled ? 1 : 0); + Settings.Secure.putInt(getContentResolver(), + Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS, enabled ? 1 : 0); } } -} \ No newline at end of file +} -- cgit v1.1