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

Commit 03c641e0 authored by Steve Kondik's avatar Steve Kondik Committed by Gerrit Code Review
Browse files

Merge "New Settings (part 2 of 2): Framework support" into ics

parents e6360004 5ae808cc
Loading
Loading
Loading
Loading
+80 −0
Original line number Diff line number Diff line
@@ -2106,6 +2106,86 @@ public final class Settings {
        */
        public static final String EXPANDED_FLASH_MODE = "expanded_flash_mode";

        /**
         * Display style of AM/PM next to clock in status bar
         * 0: Normal display (Eclair stock)
         * 1: Small display (Froyo stock)
         * 2: No display (Gingerbread/ICS stock)
         * default: 2
         * @hide
         */
        public static final String STATUS_BAR_AM_PM = "status_bar_am_pm";

        /**
         * Display style of the status bar battery information
         * 0: Display the stock battery information
         * 1: Display cm battery percentage implementation / dont show stock icon
         * 2: Hide the battery information
         * default: 0
         * @hide
         */
        public static final String STATUS_BAR_BATTERY = "status_bar_battery";

        /**
         * Whether to show the clock in status bar
         * of the stock battery icon
         * 0: don't show the clock
         * 1: show the clock
         * default: 1
         * @hide
         */
        public static final String STATUS_BAR_CLOCK = "status_bar_clock";

        /**
         * Whether to show the signal text or signal bars.
         * default: 0
         * 0: show signal bars
         * 1: show signal text numbers
         * 2: show signal text numbers w/small dBm appended
         * @hide
         */
        public static final String STATUS_BAR_CM_SIGNAL_TEXT = "status_bar_cm_signal";

         /**
         * Whether to control brightness from status bar
         *
         * @hide
         */
        public static final String STATUS_BAR_BRIGHTNESS_TOGGLE = "status_bar_brightness_toggle";

        /**
         * Whether to use a separate delay for "slide to unlock" and security
         * lock
         * @hide
         */
        public static final String SCREEN_LOCK_SLIDE_DELAY_TOGGLE = "screen_lock_slide_delay_toggle";

        /**
         * How many ms to delay before enabling the "slide to unlock" screen
         * lock when the screen goes off due to timeout
         * @hide
         */
        public static final String SCREEN_LOCK_SLIDE_TIMEOUT_DELAY = "screen_lock_slide_timeout_delay";

        /**
         * How many ms to delay before enabling the "slide to unlock" screen
         * lock when the screen is turned off by the user
         * @hide
         */
        public static final String SCREEN_LOCK_SLIDE_SCREENOFF_DELAY = "screen_lock_slide_screenoff_delay";

        /**
         * Whether to use the custom quick unlock screen control
         * @hide
         */
        public static final String LOCKSCREEN_QUICK_UNLOCK_CONTROL = "lockscreen_quick_unlock_control";

        /**
         * Whether to unlock the menu key.  The value is boolean (1 or 0).
         * @hide
         */
        public static final String MENU_UNLOCK_SCREEN = "menu_unlock_screen";

        /**
         * Settings to backup. This is here so that it's in the same place as the settings
         * keys and easy to update.