Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bac0fc1f authored by Dan Sandler's avatar Dan Sandler Committed by Android (Google) Code Review
Browse files

Merge "Track moved Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS." into lmp-dev

parents 4bdf8b49 3e2afb6e

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

+5 −5
Original line number Diff line number Diff line
@@ -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);

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

+5 −5
Original line number Diff line number Diff line
@@ -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);

        }

    }

}