summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/cyanogenmod/StatusBar.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/com/android/settings/cyanogenmod/StatusBar.java')
-rw-r--r--src/com/android/settings/cyanogenmod/StatusBar.java74
1 files changed, 34 insertions, 40 deletions
diff --git a/src/com/android/settings/cyanogenmod/StatusBar.java b/src/com/android/settings/cyanogenmod/StatusBar.java
index f9e911a..7b739ad 100644
--- a/src/com/android/settings/cyanogenmod/StatusBar.java
+++ b/src/com/android/settings/cyanogenmod/StatusBar.java
@@ -16,6 +16,7 @@
package com.android.settings.cyanogenmod;
+import android.content.ContentResolver;
import android.os.Bundle;
import android.preference.CheckBoxPreference;
import android.preference.ListPreference;
@@ -49,7 +50,6 @@ public class StatusBar extends SettingsPreferenceFragment implements OnPreferenc
private CheckBoxPreference mStatusBarClock;
private CheckBoxPreference mStatusBarBrightnessControl;
private CheckBoxPreference mStatusBarNotifCount;
- private PreferenceCategory mPrefCategoryGeneral;
@Override
public void onCreate(Bundle savedInstanceState) {
@@ -58,6 +58,7 @@ public class StatusBar extends SettingsPreferenceFragment implements OnPreferenc
addPreferencesFromResource(R.xml.status_bar);
PreferenceScreen prefSet = getPreferenceScreen();
+ ContentResolver resolver = getActivity().getContentResolver();
mStatusBarClock = (CheckBoxPreference) prefSet.findPreference(STATUS_BAR_CLOCK);
mStatusBarBrightnessControl = (CheckBoxPreference) prefSet.findPreference(STATUS_BAR_BRIGHTNESS_CONTROL);
@@ -65,15 +66,15 @@ public class StatusBar extends SettingsPreferenceFragment implements OnPreferenc
mStatusBarBattery = (ListPreference) prefSet.findPreference(STATUS_BAR_BATTERY);
mStatusBarCmSignal = (ListPreference) prefSet.findPreference(STATUS_BAR_SIGNAL);
- mStatusBarClock.setChecked((Settings.System.getInt(getActivity().getApplicationContext().getContentResolver(),
- Settings.System.STATUS_BAR_CLOCK, 1) == 1));
+ mStatusBarClock.setChecked(Settings.System.getInt(resolver, Settings.System.STATUS_BAR_CLOCK, 1) == 1);
+ mStatusBarClock.setOnPreferenceChangeListener(this);
if (DateFormat.is24HourFormat(getActivity())) {
((PreferenceCategory) prefSet.findPreference(STATUS_BAR_CLOCK_CATEGORY))
.removePreference(prefSet.findPreference(STATUS_BAR_AM_PM));
} else {
mStatusBarAmPm = (ListPreference) prefSet.findPreference(STATUS_BAR_AM_PM);
- int statusBarAmPm = Settings.System.getInt(getActivity().getContentResolver(),
+ int statusBarAmPm = Settings.System.getInt(resolver,
Settings.System.STATUS_BAR_AM_PM, 2);
mStatusBarAmPm.setValue(String.valueOf(statusBarAmPm));
@@ -81,91 +82,84 @@ public class StatusBar extends SettingsPreferenceFragment implements OnPreferenc
mStatusBarAmPm.setOnPreferenceChangeListener(this);
}
- mStatusBarBrightnessControl.setChecked((Settings.System.getInt(getActivity().getApplicationContext().getContentResolver(),
- Settings.System.STATUS_BAR_BRIGHTNESS_CONTROL, 0) == 1));
+ mStatusBarBrightnessControl.setChecked(Settings.System.getInt(resolver,
+ Settings.System.STATUS_BAR_BRIGHTNESS_CONTROL, 0) == 1);
+ mStatusBarBrightnessControl.setChecked(Settings.System.getInt(resolver,
+ Settings.System.STATUS_BAR_BRIGHTNESS_CONTROL, 0) == 1);
+ mStatusBarBrightnessControl.setOnPreferenceChangeListener(this);
try {
- if (Settings.System.getInt(getActivity().getApplicationContext().getContentResolver(),
- Settings.System.SCREEN_BRIGHTNESS_MODE) == Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC) {
+ if (Settings.System.getInt(resolver, Settings.System.SCREEN_BRIGHTNESS_MODE)
+ == Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC) {
mStatusBarBrightnessControl.setEnabled(false);
mStatusBarBrightnessControl.setSummary(R.string.status_bar_toggle_info);
}
} catch (SettingNotFoundException e) {
}
- int statusBarBattery = Settings.System.getInt(getActivity().getApplicationContext().getContentResolver(),
- Settings.System.STATUS_BAR_BATTERY, 0);
+ int statusBarBattery = Settings.System.getInt(resolver, Settings.System.STATUS_BAR_BATTERY, 0);
mStatusBarBattery.setValue(String.valueOf(statusBarBattery));
mStatusBarBattery.setSummary(mStatusBarBattery.getEntry());
mStatusBarBattery.setOnPreferenceChangeListener(this);
- int signalStyle = Settings.System.getInt(getActivity().getApplicationContext().getContentResolver(),
- Settings.System.STATUS_BAR_SIGNAL_TEXT, 0);
+ int signalStyle = Settings.System.getInt(resolver, Settings.System.STATUS_BAR_SIGNAL_TEXT, 0);
mStatusBarCmSignal.setValue(String.valueOf(signalStyle));
mStatusBarCmSignal.setSummary(mStatusBarCmSignal.getEntry());
mStatusBarCmSignal.setOnPreferenceChangeListener(this);
mStatusBarNotifCount = (CheckBoxPreference) prefSet.findPreference(STATUS_BAR_NOTIF_COUNT);
- mStatusBarNotifCount.setChecked((Settings.System.getInt(getActivity().getApplicationContext().getContentResolver(),
- Settings.System.STATUS_BAR_NOTIF_COUNT, 0) == 1));
+ mStatusBarNotifCount.setChecked(Settings.System.getInt(resolver,
+ Settings.System.STATUS_BAR_NOTIF_COUNT, 0) == 1);
+ mStatusBarNotifCount.setOnPreferenceChangeListener(this);
- mPrefCategoryGeneral = (PreferenceCategory) findPreference(STATUS_BAR_CATEGORY_GENERAL);
+ PreferenceCategory generalCategory =
+ (PreferenceCategory) findPreference(STATUS_BAR_CATEGORY_GENERAL);
if (Utils.isWifiOnly(getActivity())) {
- mPrefCategoryGeneral.removePreference(mStatusBarCmSignal);
+ generalCategory.removePreference(mStatusBarCmSignal);
}
if (Utils.isTablet(getActivity())) {
- mPrefCategoryGeneral.removePreference(mStatusBarBrightnessControl);
+ generalCategory.removePreference(mStatusBarBrightnessControl);
}
-
}
+ @Override
public boolean onPreferenceChange(Preference preference, Object newValue) {
+ ContentResolver resolver = getActivity().getContentResolver();
if (mStatusBarAmPm != null && preference == mStatusBarAmPm) {
int statusBarAmPm = Integer.valueOf((String) newValue);
int index = mStatusBarAmPm.findIndexOfValue((String) newValue);
- Settings.System.putInt(getActivity().getApplicationContext().getContentResolver(),
- Settings.System.STATUS_BAR_AM_PM, statusBarAmPm);
+ Settings.System.putInt(resolver, Settings.System.STATUS_BAR_AM_PM, statusBarAmPm);
mStatusBarAmPm.setSummary(mStatusBarAmPm.getEntries()[index]);
return true;
} else if (preference == mStatusBarBattery) {
int statusBarBattery = Integer.valueOf((String) newValue);
int index = mStatusBarBattery.findIndexOfValue((String) newValue);
- Settings.System.putInt(getActivity().getApplicationContext().getContentResolver(),
- Settings.System.STATUS_BAR_BATTERY, statusBarBattery);
+ Settings.System.putInt(resolver, Settings.System.STATUS_BAR_BATTERY, statusBarBattery);
mStatusBarBattery.setSummary(mStatusBarBattery.getEntries()[index]);
return true;
} else if (preference == mStatusBarCmSignal) {
int signalStyle = Integer.valueOf((String) newValue);
int index = mStatusBarCmSignal.findIndexOfValue((String) newValue);
- Settings.System.putInt(getActivity().getApplicationContext().getContentResolver(),
- Settings.System.STATUS_BAR_SIGNAL_TEXT, signalStyle);
+ Settings.System.putInt(resolver, Settings.System.STATUS_BAR_SIGNAL_TEXT, signalStyle);
mStatusBarCmSignal.setSummary(mStatusBarCmSignal.getEntries()[index]);
return true;
- }
- return false;
- }
-
- public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
- boolean value;
-
- if (preference == mStatusBarClock) {
- value = mStatusBarClock.isChecked();
- Settings.System.putInt(getActivity().getApplicationContext().getContentResolver(),
- Settings.System.STATUS_BAR_CLOCK, value ? 1 : 0);
+ } else if (preference == mStatusBarClock) {
+ boolean value = (Boolean) newValue;
+ Settings.System.putInt(resolver, Settings.System.STATUS_BAR_CLOCK, value ? 1 : 0);
return true;
} else if (preference == mStatusBarBrightnessControl) {
- value = mStatusBarBrightnessControl.isChecked();
- Settings.System.putInt(getActivity().getApplicationContext().getContentResolver(),
+ boolean value = (Boolean) newValue;
+ Settings.System.putInt(resolver,
Settings.System.STATUS_BAR_BRIGHTNESS_CONTROL, value ? 1 : 0);
return true;
} else if (preference == mStatusBarNotifCount) {
- value = mStatusBarNotifCount.isChecked();
- Settings.System.putInt(getActivity().getApplicationContext().getContentResolver(),
- Settings.System.STATUS_BAR_NOTIF_COUNT, value ? 1 : 0);
+ boolean value = (Boolean) newValue;
+ Settings.System.putInt(resolver, Settings.System.STATUS_BAR_NOTIF_COUNT, value ? 1 : 0);
return true;
}
+
return false;
}
}
generated by cgit v1.1 at 2025-02-03 19:40:09 +0000