summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/DisplaySettings.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/com/android/settings/DisplaySettings.java')
-rw-r--r--src/com/android/settings/DisplaySettings.java14
1 files changed, 14 insertions, 0 deletions
diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java
index 5887140..d2c227b 100644
--- a/src/com/android/settings/DisplaySettings.java
+++ b/src/com/android/settings/DisplaySettings.java
@@ -39,6 +39,8 @@ import android.util.Log;
import android.view.IWindowManager;
import android.view.Surface;
+import com.android.settings.DreamSettings;
+
import java.util.ArrayList;
public class DisplaySettings extends SettingsPreferenceFragment implements
@@ -52,6 +54,7 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
private static final String KEY_ACCELEROMETER = "accelerometer";
private static final String KEY_FONT_SIZE = "font_size";
private static final String KEY_NOTIFICATION_PULSE = "notification_pulse";
+ private static final String KEY_SCREEN_SAVER = "screensaver";
private CheckBoxPreference mAccelerometer;
private ListPreference mFontSizePref;
@@ -60,6 +63,7 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
private final Configuration mCurConfig = new Configuration();
private ListPreference mScreenTimeoutPreference;
+ private Preference mScreenSaverPreference;
private ContentObserver mAccelerometerRotationObserver = new ContentObserver(new Handler()) {
@Override
@@ -78,6 +82,8 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
mAccelerometer = (CheckBoxPreference) findPreference(KEY_ACCELEROMETER);
mAccelerometer.setPersistent(false);
+ mScreenSaverPreference = findPreference(KEY_SCREEN_SAVER);
+
mScreenTimeoutPreference = (ListPreference) findPreference(KEY_SCREEN_TIMEOUT);
final long currentTimeout = Settings.System.getLong(resolver, SCREEN_OFF_TIMEOUT,
FALLBACK_SCREEN_TIMEOUT_VALUE);
@@ -213,6 +219,14 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
private void updateState() {
updateAccelerometerRotationCheckbox();
readFontSizePreference(mFontSizePref);
+ updateScreenSaverSummary();
+ }
+
+ private void updateScreenSaverSummary() {
+ mScreenSaverPreference.setSummary(
+ DreamSettings.isScreenSaverEnabled(mScreenSaverPreference.getContext())
+ ? R.string.screensaver_settings_summary_on
+ : R.string.screensaver_settings_summary_off);
}
private void updateAccelerometerRotationCheckbox() {