summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--res/xml/button_settings.xml2
-rw-r--r--res/xml/language_settings.xml2
-rw-r--r--res/xml/notification_light_settings.xml2
-rw-r--r--res/xml/security_settings_pin.xml2
-rw-r--r--res/xml/status_bar_settings.xml4
-rw-r--r--src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java2
-rw-r--r--src/com/android/settings/notificationlight/NotificationLightSettings.java89
7 files changed, 48 insertions, 55 deletions
diff --git a/res/xml/button_settings.xml b/res/xml/button_settings.xml
index 471986a..27557cf 100644
--- a/res/xml/button_settings.xml
+++ b/res/xml/button_settings.xml
@@ -246,7 +246,7 @@
android:title="@string/button_wake_title"
android:defaultValue="false" />
- <com.android.settings.cyanogenmod.SystemSettingSwitchPreference
+ <com.android.settings.cyanogenmod.CMSystemSettingSwitchPreference
android:key="volbtn_music_controls"
android:title="@string/volbtn_music_controls_title"
android:summary="@string/volbtn_music_controls_summary"
diff --git a/res/xml/language_settings.xml b/res/xml/language_settings.xml
index d4bcdfc..b682c45 100644
--- a/res/xml/language_settings.xml
+++ b/res/xml/language_settings.xml
@@ -87,7 +87,7 @@
</PreferenceCategory>
- <com.android.settings.cyanogenmod.SystemSettingSwitchPreference
+ <com.android.settings.cyanogenmod.CMSystemSettingSwitchPreference
android:key="status_bar_ime_switcher"
android:title="@string/ime_switcher_notify"
android:summary="@string/ime_switcher_notify_summary"
diff --git a/res/xml/notification_light_settings.xml b/res/xml/notification_light_settings.xml
index 895a0ee..683a399 100644
--- a/res/xml/notification_light_settings.xml
+++ b/res/xml/notification_light_settings.xml
@@ -31,7 +31,7 @@
android:persistent="false"
android:dependency="notification_light_pulse" />
- <com.android.settings.cyanogenmod.SystemSettingSwitchPreference
+ <com.android.settings.cyanogenmod.CMSystemSettingSwitchPreference
android:key="notification_light_pulse_custom_enable"
android:title="@string/notification_light_use_custom"
android:dependency="notification_light_pulse" />
diff --git a/res/xml/security_settings_pin.xml b/res/xml/security_settings_pin.xml
index 735d75d..6629f28 100644
--- a/res/xml/security_settings_pin.xml
+++ b/res/xml/security_settings_pin.xml
@@ -34,7 +34,7 @@
android:fragment="com.android.settings.cyanogenmod.LockscreenShortcuts"
android:title="@string/lockscreen_targets_message" />
- <com.android.settings.cyanogenmod.SystemSettingSwitchPreference
+ <com.android.settings.cyanogenmod.CMSystemSettingSwitchPreference
android:key="lockscreen_scramble_pin_layout"
android:title="@string/unlock_scramble_pin_layout_title"
android:summary="@string/unlock_scramble_pin_layout_summary" />
diff --git a/res/xml/status_bar_settings.xml b/res/xml/status_bar_settings.xml
index 5791546..f9b1cc3 100644
--- a/res/xml/status_bar_settings.xml
+++ b/res/xml/status_bar_settings.xml
@@ -52,13 +52,13 @@
android:entries="@array/status_bar_battery_percentage_entries"
android:entryValues="@array/status_bar_battery_percentage_values" />
- <com.android.settings.cyanogenmod.SystemSettingSwitchPreference
+ <com.android.settings.cyanogenmod.CMSystemSettingSwitchPreference
android:key="status_bar_brightness_control"
android:title="@string/status_bar_toggle_brightness"
android:summary="@string/status_bar_toggle_brightness_summary"
android:defaultValue="false" />
- <com.android.settings.cyanogenmod.SystemSettingSwitchPreference
+ <com.android.settings.cyanogenmod.CMSystemSettingSwitchPreference
android:key="status_bar_notif_count"
android:title="@string/status_bar_notif_count_title"
android:summary="@string/status_bar_notif_count_summary"
diff --git a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java b/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
index 5314155..77e4a89 100644
--- a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
+++ b/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
@@ -238,7 +238,7 @@ public class InputMethodAndLanguageSettings extends SettingsPreferenceFragment
boolean showCmImeSwitcher = getResources().getBoolean(
com.android.internal.R.bool.config_show_cmIMESwitcher);
if (!showCmImeSwitcher) {
- Preference pref = findPreference(Settings.System.STATUS_BAR_IME_SWITCHER);
+ Preference pref = findPreference(CMSettings.System.STATUS_BAR_IME_SWITCHER);
if (pref != null) {
getPreferenceScreen().removePreference(pref);
}
diff --git a/src/com/android/settings/notificationlight/NotificationLightSettings.java b/src/com/android/settings/notificationlight/NotificationLightSettings.java
index 8bd9b87..ef40cee 100644
--- a/src/com/android/settings/notificationlight/NotificationLightSettings.java
+++ b/src/com/android/settings/notificationlight/NotificationLightSettings.java
@@ -53,18 +53,11 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import cyanogenmod.providers.CMSettings;
+
public class NotificationLightSettings extends SettingsPreferenceFragment implements
Preference.OnPreferenceChangeListener, AdapterView.OnItemLongClickListener {
private static final String TAG = "NotificationLightSettings";
- private static final String NOTIFICATION_LIGHT_PULSE_DEFAULT_COLOR = "notification_light_pulse_default_color";
- private static final String NOTIFICATION_LIGHT_PULSE_DEFAULT_LED_ON = "notification_light_pulse_default_led_on";
- private static final String NOTIFICATION_LIGHT_PULSE_DEFAULT_LED_OFF = "notification_light_pulse_default_led_off";
- private static final String NOTIFICATION_LIGHT_PULSE_CALL_COLOR = "notification_light_pulse_call_color";
- private static final String NOTIFICATION_LIGHT_PULSE_CALL_LED_ON = "notification_light_pulse_call_led_on";
- private static final String NOTIFICATION_LIGHT_PULSE_CALL_LED_OFF = "notification_light_pulse_call_led_off";
- private static final String NOTIFICATION_LIGHT_PULSE_VMAIL_COLOR = "notification_light_pulse_vmail_color";
- private static final String NOTIFICATION_LIGHT_PULSE_VMAIL_LED_ON = "notification_light_pulse_vmail_led_on";
- private static final String NOTIFICATION_LIGHT_PULSE_VMAIL_LED_OFF = "notification_light_pulse_vmail_led_off";
private static final String DEFAULT_PREF = "default";
private static final String MISSED_CALL_PREF = "missed_call";
private static final String VOICEMAIL_PREF = "voicemail";
@@ -119,7 +112,7 @@ public class NotificationLightSettings extends SettingsPreferenceFragment implem
findPreference(Settings.System.NOTIFICATION_LIGHT_PULSE);
mEnabledPref.setOnPreferenceChangeListener(this);
mCustomEnabledPref = (SystemSettingSwitchPreference)
- findPreference(Settings.System.NOTIFICATION_LIGHT_PULSE_CUSTOM_ENABLE);
+ findPreference(CMSettings.System.NOTIFICATION_LIGHT_PULSE_CUSTOM_ENABLE);
mCustomEnabledPref.setOnPreferenceChangeListener(this);
mDefaultPref = (ApplicationLightPreference) findPreference(DEFAULT_PREF);
@@ -201,34 +194,34 @@ public class NotificationLightSettings extends SettingsPreferenceFragment implem
private void refreshDefault() {
ContentResolver resolver = getContentResolver();
- int color = Settings.System.getInt(resolver,
- NOTIFICATION_LIGHT_PULSE_DEFAULT_COLOR, mDefaultColor);
- int timeOn = Settings.System.getInt(resolver,
- NOTIFICATION_LIGHT_PULSE_DEFAULT_LED_ON, mDefaultLedOn);
- int timeOff = Settings.System.getInt(resolver,
- NOTIFICATION_LIGHT_PULSE_DEFAULT_LED_OFF, mDefaultLedOff);
+ int color = CMSettings.System.getInt(resolver,
+ CMSettings.System.NOTIFICATION_LIGHT_PULSE_DEFAULT_COLOR, mDefaultColor);
+ int timeOn = CMSettings.System.getInt(resolver,
+ CMSettings.System.NOTIFICATION_LIGHT_PULSE_DEFAULT_LED_ON, mDefaultLedOn);
+ int timeOff = CMSettings.System.getInt(resolver,
+ CMSettings.System.NOTIFICATION_LIGHT_PULSE_DEFAULT_LED_OFF, mDefaultLedOff);
mDefaultPref.setAllValues(color, timeOn, timeOff);
// Get Missed call and Voicemail values
if (mCallPref != null) {
- int callColor = Settings.System.getInt(resolver,
- NOTIFICATION_LIGHT_PULSE_CALL_COLOR, mDefaultColor);
- int callTimeOn = Settings.System.getInt(resolver,
- NOTIFICATION_LIGHT_PULSE_CALL_LED_ON, mDefaultLedOn);
- int callTimeOff = Settings.System.getInt(resolver,
- NOTIFICATION_LIGHT_PULSE_CALL_LED_OFF, mDefaultLedOff);
+ int callColor = CMSettings.System.getInt(resolver,
+ CMSettings.System.NOTIFICATION_LIGHT_PULSE_CALL_COLOR, mDefaultColor);
+ int callTimeOn = CMSettings.System.getInt(resolver,
+ CMSettings.System.NOTIFICATION_LIGHT_PULSE_CALL_LED_ON, mDefaultLedOn);
+ int callTimeOff = CMSettings.System.getInt(resolver,
+ CMSettings.System.NOTIFICATION_LIGHT_PULSE_CALL_LED_OFF, mDefaultLedOff);
mCallPref.setAllValues(callColor, callTimeOn, callTimeOff);
}
if (mVoicemailPref != null) {
- int vmailColor = Settings.System.getInt(resolver,
- NOTIFICATION_LIGHT_PULSE_VMAIL_COLOR, mDefaultColor);
- int vmailTimeOn = Settings.System.getInt(resolver,
- NOTIFICATION_LIGHT_PULSE_VMAIL_LED_ON, mDefaultLedOn);
- int vmailTimeOff = Settings.System.getInt(resolver,
- NOTIFICATION_LIGHT_PULSE_VMAIL_LED_OFF, mDefaultLedOff);
+ int vmailColor = CMSettings.System.getInt(resolver,
+ CMSettings.System.NOTIFICATION_LIGHT_PULSE_VMAIL_COLOR, mDefaultColor);
+ int vmailTimeOn = CMSettings.System.getInt(resolver,
+ CMSettings.System.NOTIFICATION_LIGHT_PULSE_VMAIL_LED_ON, mDefaultLedOn);
+ int vmailTimeOff = CMSettings.System.getInt(resolver,
+ CMSettings.System.NOTIFICATION_LIGHT_PULSE_VMAIL_LED_OFF, mDefaultLedOff);
mVoicemailPref.setAllValues(vmailColor, vmailTimeOn, vmailTimeOff);
}
@@ -289,8 +282,8 @@ public class NotificationLightSettings extends SettingsPreferenceFragment implem
}
private boolean parsePackageList() {
- final String baseString = Settings.System.getString(getContentResolver(),
- Settings.System.NOTIFICATION_LIGHT_PULSE_CUSTOM_VALUES);
+ final String baseString = CMSettings.System.getString(getContentResolver(),
+ CMSettings.System.NOTIFICATION_LIGHT_PULSE_CUSTOM_VALUES);
if (TextUtils.equals(mPackageList, baseString)) {
return false;
@@ -324,8 +317,8 @@ public class NotificationLightSettings extends SettingsPreferenceFragment implem
if (preferencesUpdated) {
mPackageList = value;
}
- Settings.System.putString(getContentResolver(),
- Settings.System.NOTIFICATION_LIGHT_PULSE_CUSTOM_VALUES, value);
+ CMSettings.System.putString(getContentResolver(),
+ CMSettings.System.NOTIFICATION_LIGHT_PULSE_CUSTOM_VALUES, value);
}
/**
@@ -340,21 +333,21 @@ public class NotificationLightSettings extends SettingsPreferenceFragment implem
ContentResolver resolver = getContentResolver();
if (packageName.equals(DEFAULT_PREF)) {
- Settings.System.putInt(resolver, NOTIFICATION_LIGHT_PULSE_DEFAULT_COLOR, color);
- Settings.System.putInt(resolver, NOTIFICATION_LIGHT_PULSE_DEFAULT_LED_ON, timeon);
- Settings.System.putInt(resolver, NOTIFICATION_LIGHT_PULSE_DEFAULT_LED_OFF, timeoff);
+ CMSettings.System.putInt(resolver, CMSettings.System.NOTIFICATION_LIGHT_PULSE_DEFAULT_COLOR, color);
+ CMSettings.System.putInt(resolver, CMSettings.System.NOTIFICATION_LIGHT_PULSE_DEFAULT_LED_ON, timeon);
+ CMSettings.System.putInt(resolver, CMSettings.System.NOTIFICATION_LIGHT_PULSE_DEFAULT_LED_OFF, timeoff);
refreshDefault();
return;
} else if (packageName.equals(MISSED_CALL_PREF)) {
- Settings.System.putInt(resolver, NOTIFICATION_LIGHT_PULSE_CALL_COLOR, color);
- Settings.System.putInt(resolver, NOTIFICATION_LIGHT_PULSE_CALL_LED_ON, timeon);
- Settings.System.putInt(resolver, NOTIFICATION_LIGHT_PULSE_CALL_LED_OFF, timeoff);
+ CMSettings.System.putInt(resolver, CMSettings.System.NOTIFICATION_LIGHT_PULSE_CALL_COLOR, color);
+ CMSettings.System.putInt(resolver, CMSettings.System.NOTIFICATION_LIGHT_PULSE_CALL_LED_ON, timeon);
+ CMSettings.System.putInt(resolver, CMSettings.System.NOTIFICATION_LIGHT_PULSE_CALL_LED_OFF, timeoff);
refreshDefault();
return;
} else if (packageName.equals(VOICEMAIL_PREF)) {
- Settings.System.putInt(resolver, NOTIFICATION_LIGHT_PULSE_VMAIL_COLOR, color);
- Settings.System.putInt(resolver, NOTIFICATION_LIGHT_PULSE_VMAIL_LED_ON, timeon);
- Settings.System.putInt(resolver, NOTIFICATION_LIGHT_PULSE_VMAIL_LED_OFF, timeoff);
+ CMSettings.System.putInt(resolver, CMSettings.System.NOTIFICATION_LIGHT_PULSE_VMAIL_COLOR, color);
+ CMSettings.System.putInt(resolver, CMSettings.System.NOTIFICATION_LIGHT_PULSE_VMAIL_LED_ON, timeon);
+ CMSettings.System.putInt(resolver, CMSettings.System.NOTIFICATION_LIGHT_PULSE_VMAIL_LED_OFF, timeoff);
refreshDefault();
return;
}
@@ -373,16 +366,16 @@ public class NotificationLightSettings extends SettingsPreferenceFragment implem
ContentResolver resolver = getContentResolver();
// Reset to the framework default colors
- Settings.System.putInt(resolver, NOTIFICATION_LIGHT_PULSE_DEFAULT_COLOR, mDefaultColor);
- Settings.System.putInt(resolver, NOTIFICATION_LIGHT_PULSE_CALL_COLOR, mDefaultColor);
- Settings.System.putInt(resolver, NOTIFICATION_LIGHT_PULSE_VMAIL_COLOR, mDefaultColor);
+ CMSettings.System.putInt(resolver, CMSettings.System.NOTIFICATION_LIGHT_PULSE_DEFAULT_COLOR, mDefaultColor);
+ CMSettings.System.putInt(resolver, CMSettings.System.NOTIFICATION_LIGHT_PULSE_CALL_COLOR, mDefaultColor);
+ CMSettings.System.putInt(resolver, CMSettings.System.NOTIFICATION_LIGHT_PULSE_VMAIL_COLOR, mDefaultColor);
// Reset to the framework default custom pulse length & speed
- Settings.System.putInt(resolver, NOTIFICATION_LIGHT_PULSE_CALL_LED_ON, mDefaultLedOn);
- Settings.System.putInt(resolver, NOTIFICATION_LIGHT_PULSE_CALL_LED_OFF, mDefaultLedOff);
+ CMSettings.System.putInt(resolver, CMSettings.System.NOTIFICATION_LIGHT_PULSE_CALL_LED_ON, mDefaultLedOn);
+ CMSettings.System.putInt(resolver, CMSettings.System.NOTIFICATION_LIGHT_PULSE_CALL_LED_OFF, mDefaultLedOff);
- Settings.System.putInt(resolver, NOTIFICATION_LIGHT_PULSE_VMAIL_LED_ON, mDefaultLedOn);
- Settings.System.putInt(resolver, NOTIFICATION_LIGHT_PULSE_VMAIL_LED_OFF, mDefaultLedOff);
+ CMSettings.System.putInt(resolver, CMSettings.System.NOTIFICATION_LIGHT_PULSE_VMAIL_LED_ON, mDefaultLedOn);
+ CMSettings.System.putInt(resolver, CMSettings.System.NOTIFICATION_LIGHT_PULSE_VMAIL_LED_OFF, mDefaultLedOff);
refreshDefault();
}
generated by cgit v1.1 at 2025-08-16 04:26:23 +0000