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

Commit acee80f8 authored by Julia Reynolds's avatar Julia Reynolds Committed by android-build-merger
Browse files

Merge "Silent notifs appear on lockscreen by default" into qt-dev am: f58cd0fb 

am: 520a4807

Change-Id: I66b0830dc86ee78e97541be0e4ab412eeb2457e5
parents 769bcd2e 520a4807

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -72,7 +72,7 @@ public class GentleDrawablePreferenceController extends BasePreferenceController 




    private boolean showOnLockscreen() {

    private boolean showOnLockscreen() {

        return Settings.Secure.getInt(mContext.getContentResolver(),

        return Settings.Secure.getInt(mContext.getContentResolver(),

                Settings.Secure.LOCK_SCREEN_SHOW_SILENT_NOTIFICATIONS, 0) == ON;

                Settings.Secure.LOCK_SCREEN_SHOW_SILENT_NOTIFICATIONS, ON) == ON;

    }

    }





    private boolean showOnStatusBar() {

    private boolean showOnStatusBar() {

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -69,7 +69,7 @@ public class GentleNotificationsPreferenceController extends BasePreferenceContr 




    private boolean showOnLockscreen() {

    private boolean showOnLockscreen() {

        return Settings.Secure.getInt(mContext.getContentResolver(),

        return Settings.Secure.getInt(mContext.getContentResolver(),

                Settings.Secure.LOCK_SCREEN_SHOW_SILENT_NOTIFICATIONS, 0) == ON;

                Settings.Secure.LOCK_SCREEN_SHOW_SILENT_NOTIFICATIONS, ON) == ON;

    }

    }





    private boolean showOnStatusBar() {

    private boolean showOnStatusBar() {

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -66,7 +66,7 @@ public class ImportancePreferenceController extends NotificationPreferenceContro 
            pref.setImportance(mChannel.getImportance());

            pref.setImportance(mChannel.getImportance());

            pref.setDisplayInStatusBar(mBackend.showSilentInStatusBar(mContext.getPackageName()));

            pref.setDisplayInStatusBar(mBackend.showSilentInStatusBar(mContext.getPackageName()));

            pref.setDisplayOnLockscreen(Settings.Secure.getInt(mContext.getContentResolver(),

            pref.setDisplayOnLockscreen(Settings.Secure.getInt(mContext.getContentResolver(),

                    Settings.Secure.LOCK_SCREEN_SHOW_SILENT_NOTIFICATIONS, 0) == 1);

                    Settings.Secure.LOCK_SCREEN_SHOW_SILENT_NOTIFICATIONS, 1) == 1);

        }

        }

    }

    }

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -150,11 +150,11 @@ public class ShowOnLockScreenNotificationPreferenceController extends AbstractPr 




    private boolean getLockscreenNotificationsEnabled() {

    private boolean getLockscreenNotificationsEnabled() {

        return Settings.Secure.getInt(mContext.getContentResolver(),

        return Settings.Secure.getInt(mContext.getContentResolver(),

                Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS, 0) != 0;

                Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS, 1) != 0;

    }

    }





    private boolean getLockscreenSilentNotificationsEnabled() {

    private boolean getLockscreenSilentNotificationsEnabled() {

        return Settings.Secure.getInt(mContext.getContentResolver(),

        return Settings.Secure.getInt(mContext.getContentResolver(),

                Settings.Secure.LOCK_SCREEN_SHOW_SILENT_NOTIFICATIONS, 0) != 0;

                Settings.Secure.LOCK_SCREEN_SHOW_SILENT_NOTIFICATIONS, 1) != 0;

    }

    }

}
 
}

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -38,7 +38,7 @@ public class SilentLockscreenPreferenceController extends TogglePreferenceContro 
    @Override

    @Override

    public boolean isChecked() {

    public boolean isChecked() {

        return Settings.Secure.getInt(mContext.getContentResolver(),

        return Settings.Secure.getInt(mContext.getContentResolver(),

                Settings.Secure.LOCK_SCREEN_SHOW_SILENT_NOTIFICATIONS, 0) == 1;

                Settings.Secure.LOCK_SCREEN_SHOW_SILENT_NOTIFICATIONS, 1) == 1;

    }

    }





    @Override

    @Override