From 6df18e2713a15a52567ac1a833953ac4bfa38f15 Mon Sep 17 00:00:00 2001 From: John Spurlock Date: Wed, 22 Aug 2012 09:21:58 -0400 Subject: New dream settings - first cut First draft implementation of mocks for dream settings. Want to merge for the weekly build, so a few things remain, namely: - flat style for preview/settings buttons + dividers - animation between dream row expanded/collapsed state - wire up the help url - possibly ditch the non-standard style - add logging - refresh when packages are installed/uninstalled Bug:7010260 Change-Id: I96e3ab944170925bd76edf7b8b1127adfffc6262 --- src/com/android/settings/DisplaySettings.java | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'src/com/android/settings/DisplaySettings.java') diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java index c71f886..622d77e 100644 --- a/src/com/android/settings/DisplaySettings.java +++ b/src/com/android/settings/DisplaySettings.java @@ -232,13 +232,11 @@ public class DisplaySettings extends SettingsPreferenceFragment implements } private void updateScreenSaverSummary() { - boolean activatedOnSleep = DreamSettings.isScreenSaverActivatedOnSleep(getActivity()); - boolean activatedOnDock = DreamSettings.isScreenSaverActivatedOnDock(getActivity()); - mScreenSaverPreference.setSummary( - 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); + int summaryResId = DreamSettings.getSummaryResource(getActivity()); + if (summaryResId > 0) + mScreenSaverPreference.setSummary(summaryResId); + else + mScreenSaverPreference.setSummary(""); } private void updateAccelerometerRotationCheckbox() { -- cgit v1.1