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

Commit b91e1d89 authored by Abhisek Devkota's avatar Abhisek Devkota Committed by Gerrit Code Review
Browse files

Merge "add Custom Lockscreen switch" into cm-11.0

parents f205affb 1df2f359
Loading
Loading
Loading
Loading
+7 −0
Original line number Diff line number Diff line
@@ -2649,6 +2649,12 @@ public final class Settings {
         */
        public static final String LOCKSCREEN_BATTERY_VISIBILITY = "lockscreen_always_show_battery";

        /**
         * Whether to enable the modlock keyguard
         * @hide
         */
        public static final String LOCKSCREEN_MODLOCK_ENABLED = "lockscreen_modlock_enabled";

        /**
         * @deprecated Use {@link android.provider.Settings.Global#LOW_BATTERY_SOUND}
         * instead
@@ -3633,6 +3639,7 @@ public final class Settings {
            POWER_MENU_SOUND_ENABLED,
            POWER_MENU_USER_ENABLED,
            LOCKSCREEN_BATTERY_VISIBILITY,
            LOCKSCREEN_MODLOCK_ENABLED,
            PHONE_BLACKLIST_ENABLED,
            PHONE_BLACKLIST_NOTIFY_ENABLED,
            PHONE_BLACKLIST_PRIVATE_NUMBER_MODE,