diff options
| author | Daniel Sandler <dsandler@android.com> | 2011-11-17 10:44:51 -0800 |
|---|---|---|
| committer | Daniel Sandler <dsandler@android.com> | 2011-11-17 21:06:29 -0800 |
| commit | 6f0ea441e465a0af646f8952f820a92f6902c8d9 (patch) | |
| tree | b2922b2b824e6646cba7b41b55dbe311ad20902a /res/xml/display_settings.xml | |
| parent | cee089b1526e27b9b96dbeb9549199b0f8a78c9b (diff) | |
| download | packages_apps_Settings-6f0ea441e465a0af646f8952f820a92f6902c8d9.zip packages_apps_Settings-6f0ea441e465a0af646f8952f820a92f6902c8d9.tar.gz packages_apps_Settings-6f0ea441e465a0af646f8952f820a92f6902c8d9.tar.bz2 | |
Settings changes for Android Dreams (now Screen Candy).
- new preference design
- remove candy-specific timeout
- use new settings keys
Requires Change I31f31b3
Bug: 5591015
Change-Id: I45cb6ea5c68f9932c6d4e65e2b219331d48a62d6
Diffstat (limited to 'res/xml/display_settings.xml')
| -rw-r--r-- | res/xml/display_settings.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml index 6cd2e56..b5f072f 100644 --- a/res/xml/display_settings.xml +++ b/res/xml/display_settings.xml @@ -40,9 +40,9 @@ android:entries="@array/screen_timeout_entries" android:entryValues="@array/screen_timeout_values" /> - <PreferenceScreen - android:title="@string/dream_settings_title" - android:summary="@string/dream_settings_summary" + <PreferenceScreen + android:key="screensaver" + android:title="@string/screensaver_settings_title" android:fragment="com.android.settings.DreamSettings" /> <ListPreference |