Update Settings for new Dreams architecture.

Additionally, hide all Dreams settings if the feature is
disabled (R.bool.config_enableDreams).

(Depends on change Idfe9d430)

Change-Id: Ifa05f125e411ca58605c33481de26cd29a926807
This commit is contained in:
Daniel Sandler
2012-02-01 14:14:18 -05:00
parent c8732db7e5
commit 47c991f78c
3 changed files with 108 additions and 33 deletions

View File

@@ -83,7 +83,12 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
mAccelerometer.setPersistent(false);
mScreenSaverPreference = findPreference(KEY_SCREEN_SAVER);
if (mScreenSaverPreference != null
&& getResources().getBoolean(
com.android.internal.R.bool.config_enableDreams) == false) {
getPreferenceScreen().removePreference(mScreenSaverPreference);
}
mScreenTimeoutPreference = (ListPreference) findPreference(KEY_SCREEN_TIMEOUT);
final long currentTimeout = Settings.System.getLong(resolver, SCREEN_OFF_TIMEOUT,
FALLBACK_SCREEN_TIMEOUT_VALUE);
@@ -108,6 +113,7 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
Log.e(TAG, Settings.System.NOTIFICATION_LIGHT_PULSE + " not found");
}
}
}
private void updateTimeoutPreferenceDescription(long currentTimeout) {