Framework : Move System settings to CMSettings (ad36a42d) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+0 −129

Original line number	Diff line number	Diff line
		@@ -2673,13 +2673,6 @@ public final class Settings {
		public static final String LOCK_PATTERN_TACTILE_FEEDBACK_ENABLED =
		"lock_pattern_tactile_feedback_enabled";

		/**
		* Whether to scramble a pin unlock layout
		* @hide
		*/
		public static final String LOCKSCREEN_PIN_SCRAMBLE_LAYOUT =
		"lockscreen_scramble_pin_layout";

		/**
		* A formatted string of the next alarm that is set, or the empty string
		* if there is no alarm set.
		@@ -2798,12 +2791,6 @@ public final class Settings {
		*/
		public static final int SCREEN_BRIGHTNESS_MODE_AUTOMATIC = 1;

		/**
		* Whether to show the IME switcher in the status bar
		* @hide
		*/
		public static final String STATUS_BAR_IME_SWITCHER = "status_bar_ime_switcher";

		/**
		* The keyboard brightness to be used while the screen is on.
		* Valid value range is between 0 and {@link PowerManager#getMaximumKeyboardBrightness()}
		@@ -2829,19 +2816,6 @@ public final class Settings {
		*/
		public static final String BUTTON_BACKLIGHT_TIMEOUT = "button_backlight_timeout";

		/** Whether to allow one finger quick settings expansion on the right side of the statusbar.
		*
		* @hide
		*/
		public static final String STATUS_BAR_QUICK_QS_PULLDOWN = "status_bar_quick_qs_pulldown";

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

		/**
		* Control whether the process CPU usage meter should be shown.
		*
		@@ -3286,12 +3260,6 @@ public final class Settings {
		*/
		public static final String ACCELEROMETER_ROTATION_ANGLES = "accelerometer_rotation_angles";

		/**
		* Show the pending notification counts as overlays on the status bar
		* @hide
		*/
		public static final String STATUS_BAR_NOTIF_COUNT = "status_bar_notif_count";

		/**
		* Control whether the accelerometer will be used to change screen
		* orientation. If 0, it will not be used unless explicitly requested
		@@ -3422,21 +3390,6 @@ public final class Settings {
		/** @hide */
		public static final Validator SHOW_WEB_SUGGESTIONS_VALIDATOR = sBooleanValidator;

		/**
		* Contains the notifications light maximum brightness to use.
		* @hide
		*/
		public static final String NOTIFICATION_LIGHT_BRIGHTNESS_LEVEL =
		"notification_light_brightness_level";

		/**
		* Whether to allow notifications with the screen on or DayDreams.
		* The value is boolean (1 or 0). Default will always be false.
		* @hide
		*/
		public static final String NOTIFICATION_LIGHT_SCREEN_ON =
		"notification_light_screen_on_enable";

		/**
		* Whether the notification LED should repeatedly flash when a notification is
		* pending. The value is boolean (1 or 0).
		@@ -3447,88 +3400,6 @@ public final class Settings {
		/** @hide */
		public static final Validator NOTIFICATION_LIGHT_PULSE_VALIDATOR = sBooleanValidator;

		/**
		* What color to use for the notification LED by default
		* @hide
		*/
		public static final String NOTIFICATION_LIGHT_PULSE_DEFAULT_COLOR =
		"notification_light_pulse_default_color";

		/**
		* How long to flash the notification LED by default
		* @hide
		*/
		public static final String NOTIFICATION_LIGHT_PULSE_DEFAULT_LED_ON =
		"notification_light_pulse_default_led_on";

		/**
		* How long to wait between flashes for the notification LED by default
		* @hide
		*/
		public static final String NOTIFICATION_LIGHT_PULSE_DEFAULT_LED_OFF =
		"notification_light_pulse_default_led_off";

		/**
		* What color to use for the missed call notification LED
		* @hide
		*/
		public static final String NOTIFICATION_LIGHT_PULSE_CALL_COLOR =
		"notification_light_pulse_call_color";

		/**
		* How long to flash the missed call notification LED
		* @hide
		*/
		public static final String NOTIFICATION_LIGHT_PULSE_CALL_LED_ON =
		"notification_light_pulse_call_led_on";

		/**
		* How long to wait between flashes for the missed call notification LED
		* @hide
		*/
		public static final String NOTIFICATION_LIGHT_PULSE_CALL_LED_OFF =
		"notification_light_pulse_call_led_off";
		/**
		* What color to use for the voicemail notification LED
		* @hide
		*/
		public static final String NOTIFICATION_LIGHT_PULSE_VMAIL_COLOR =
		"notification_light_pulse_vmail_color";

		/**
		* How long to flash the voicemail notification LED
		* @hide
		*/
		public static final String NOTIFICATION_LIGHT_PULSE_VMAIL_LED_ON =
		"notification_light_pulse_vmail_led_on";

		/**
		* How long to wait between flashes for the voicemail notification LED
		* @hide
		*/
		public static final String NOTIFICATION_LIGHT_PULSE_VMAIL_LED_OFF =
		"notification_light_pulse_vmail_led_off";

		/**
		* Whether to use the custom LED values for the notification pulse LED.
		* @hide
		*/
		public static final String NOTIFICATION_LIGHT_PULSE_CUSTOM_ENABLE =
		"notification_light_pulse_custom_enable";

		/**
		* Which custom LED values to use for the notification pulse LED.
		* @hide
		*/
		public static final String NOTIFICATION_LIGHT_PULSE_CUSTOM_VALUES =
		"notification_light_pulse_custom_values";

		/**
		* Sprint MWI Quirk: Show message wait indicator notifications
		* @hide
		*/
		public static final String ENABLE_MWI_NOTIFICATION = "enable_mwi_notification";

		/**
		* Show pointer location on screen?
		* 0 = no

packages/Keyguard/Android.mk

+2 −0

Original line number	Diff line number	Diff line
		@@ -18,6 +18,8 @@ include $(CLEAR_VARS)

		LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-subdir-Iaidl-files)

		LOCAL_STATIC_JAVA_LIBRARIES := org.cyanogenmod.platform.sdk

		LOCAL_MODULE := Keyguard

		LOCAL_CERTIFICATE := platform

packages/Keyguard/src/com/android/keyguard/KeyguardPINView.java

+4 −2

Original line number	Diff line number	Diff line
		@@ -32,6 +32,8 @@ import java.util.List;
		import com.android.settingslib.animation.AppearAnimationUtils;
		import com.android.settingslib.animation.DisappearAnimationUtils;

		import cyanogenmod.providers.CMSettings;

		/**
		* Displays a PIN pad for unlocking.
		*/
		@@ -117,8 +119,8 @@ public class KeyguardPINView extends KeyguardPinBasedInputView {
		null, mEcaView, null
		}};

		boolean scramblePin = (Settings.System.getInt(getContext().getContentResolver(),
		Settings.System.LOCKSCREEN_PIN_SCRAMBLE_LAYOUT, 0) == 1);
		boolean scramblePin = (CMSettings.System.getInt(getContext().getContentResolver(),
		CMSettings.System.LOCKSCREEN_PIN_SCRAMBLE_LAYOUT, 0) == 1);

		if (scramblePin) {
		Collections.shuffle(sNumbers);

packages/Keyguard/src/com/android/keyguard/NumPadKey.java

+4 −2

Original line number	Diff line number	Diff line
		@@ -31,6 +31,8 @@ import android.widget.TextView;

		import com.android.internal.widget.LockPatternUtils;

		import cyanogenmod.providers.CMSettings;

		public class NumPadKey extends ViewGroup {
		// list of "ABC", etc per digit, starting with '0'
		static String sKlondike[];
		@@ -120,8 +122,8 @@ public class NumPadKey extends ViewGroup {
		}

		private void updateText() {
		boolean scramblePin = (Settings.System.getInt(getContext().getContentResolver(),
		Settings.System.LOCKSCREEN_PIN_SCRAMBLE_LAYOUT, 0) == 1);
		boolean scramblePin = (CMSettings.System.getInt(getContext().getContentResolver(),
		CMSettings.System.LOCKSCREEN_PIN_SCRAMBLE_LAYOUT, 0) == 1);
		if (mDigit >= 0) {
		mDigitText.setText(Integer.toString(mDigit));
		if (sKlondike == null) {

packages/SystemUI/src/com/android/systemui/qs/QSPanel.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -48,6 +48,8 @@ import com.android.systemui.tuner.TunerService.Tunable;
		import java.util.ArrayList;
		import java.util.Collection;

		import cyanogenmod.providers.CMSettings;

		/ View that represents the quick settings tile panel. /
		public class QSPanel extends LinearLayout implements Tunable, Callback {