diff options
Diffstat (limited to 'src/com/android/settings/DisplaySettings.java')
| -rw-r--r-- | src/com/android/settings/DisplaySettings.java | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java index fc162e2..c71f886 100644 --- a/src/com/android/settings/DisplaySettings.java +++ b/src/com/android/settings/DisplaySettings.java @@ -232,10 +232,13 @@ public class DisplaySettings extends SettingsPreferenceFragment implements } private void updateScreenSaverSummary() { + boolean activatedOnSleep = DreamSettings.isScreenSaverActivatedOnSleep(getActivity()); + boolean activatedOnDock = DreamSettings.isScreenSaverActivatedOnDock(getActivity()); mScreenSaverPreference.setSummary( - DreamSettings.isScreenSaverEnabled(mScreenSaverPreference.getContext()) - ? R.string.screensaver_settings_summary_on - : R.string.screensaver_settings_summary_off); + activatedOnSleep && activatedOnDock ? R.string.screensaver_settings_summary_both : + activatedOnSleep ? R.string.screensaver_settings_summary_sleep : + activatedOnDock ? R.string.screensaver_settings_summary_dock : + R.string.screensaver_settings_summary_off); } private void updateAccelerometerRotationCheckbox() { |