Merge "Show screen saver toggle on tablets." into ics-mr1

[android-x86/packages-apps-Settings.git] / res / xml / dream_settings.xml

diff --git a/res/xml/dream_settings.xml b/res/xml/dream_settings.xml
index 1fbb3e9..6569bc7 100644 (file)
--- a/res/xml/dream_settings.xml
+++ b/res/xml/dream_settings.xml
@@ -15,27 +15,25 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        android:title="@string/dream_settings_title"
+        android:title="@string/screensaver_settings_title"
         xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
 
     <com.android.settings.DreamComponentPreference
-            android:key="dream_component"
-            android:title="@string/dream_component_title"
+            android:key="screensaver_component"
+            android:title="@string/screensaver_component_title"
             android:persistent="false"
             />
 
-    <ListPreference
-            android:key="dream_timeout"
-            android:title="@string/dream_timeout_title"
-            android:summary="@string/dream_timeout_summary"
-            android:persistent="false"
-            android:entries="@array/dream_timeout_entries"
-            android:entryValues="@array/dream_timeout_values" />
-    
     <com.android.settings.DreamTesterPreference
-            android:key="dream_test"
-            android:title="@string/dream_test"
+            android:key="test"
+            android:title="@string/screensaver_test"
             android:persistent="false"
             />
 
+    <CheckBoxPreference
+            android:key="activate_on_dock"
+            android:persistent="false"
+            android:title="@string/screensaver_activate_on_dock_title"
+            android:defaultValue="true" />
+
 </PreferenceScreen>