diff options
| author | John Spurlock <jspurlock@google.com> | 2012-08-22 09:21:58 -0400 |
|---|---|---|
| committer | John Spurlock <jspurlock@google.com> | 2012-08-29 16:41:01 -0400 |
| commit | 6df18e2713a15a52567ac1a833953ac4bfa38f15 (patch) | |
| tree | aed4f01d174b23d2dee2fd912f82fbf74bb171de /src/com/android/settings/DisplaySettings.java | |
| parent | c6015d2f593d0e5ef909d7157df4b15831236acb (diff) | |
| download | packages_apps_settings-6df18e2713a15a52567ac1a833953ac4bfa38f15.zip packages_apps_settings-6df18e2713a15a52567ac1a833953ac4bfa38f15.tar.gz packages_apps_settings-6df18e2713a15a52567ac1a833953ac4bfa38f15.tar.bz2 | |
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
Diffstat (limited to 'src/com/android/settings/DisplaySettings.java')
| -rw-r--r-- | src/com/android/settings/DisplaySettings.java | 12 |
1 files changed, 5 insertions, 7 deletions
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() { |