X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=android%2Fproject%2Fxscreensaver%2Fres%2Fxml%2Fhypertorus_settings.xml;h=c1e98c5b130a5d70cfe48c79a1bd9f4d97d80112;hp=55079b954a5c250aaead45717dc8b1c77d5399b0;hb=88cfe534a698a0562e81345957a50714af1453bc;hpb=d1ae2829ff0fd2a96c16a0c8c5420efaa47d7b30

diff --git a/android/project/xscreensaver/res/xml/hypertorus_settings.xml b/android/project/xscreensaver/res/xml/hypertorus_settings.xml
index 55079b95..c1e98c5b 100644
--- a/android/project/xscreensaver/res/xml/hypertorus_settings.xml
+++ b/android/project/xscreensaver/res/xml/hypertorus_settings.xml
@@ -4,49 +4,11 @@
         android:title="@string/hypertorus_settings"
         android:key="hypertoruswallpaper_settings">
     <org.jwz.xscreensaver.SliderPreference
-        android:defaultValue="@string/hypertorus_speedxz_float"
-        android:dialogMessage="@string/hypertorus_speedxz_settings_summary"
-        android:key="hypertorus_speedxz"
-        android:summary="@array/hypertorus_speedxz_prefix"
-        android:title="@string/hypertorus_speedxz_settings_title" />
-    <ListPreference
-            android:key="hypertorus_projection3d"
-            android:title="@string/hypertorus_projection3d_settings_title"
-            android:summary="@string/hypertorus_projection3d_settings_summary"
-            android:entries="@array/hypertorus_projection3d_names"
-            android:defaultValue="@string/hypertorus_projection3d_default"
-            android:entryValues="@array/hypertorus_projection3d_prefix" />
-    <org.jwz.xscreensaver.SliderPreference
-        android:defaultValue="@string/hypertorus_speedxy_float"
-        android:dialogMessage="@string/hypertorus_speedxy_settings_summary"
-        android:key="hypertorus_speedxy"
-        android:summary="@array/hypertorus_speedxy_prefix"
-        android:title="@string/hypertorus_speedxy_settings_title" />
-    <org.jwz.xscreensaver.SliderPreference
-        android:defaultValue="@string/hypertorus_speedwy_float"
-        android:dialogMessage="@string/hypertorus_speedwy_settings_summary"
-        android:key="hypertorus_speedwy"
-        android:summary="@array/hypertorus_speedwy_prefix"
-        android:title="@string/hypertorus_speedwy_settings_title" />
-    <org.jwz.xscreensaver.SliderPreference
-        android:defaultValue="@string/hypertorus_speedwx_float"
-        android:dialogMessage="@string/hypertorus_speedwx_settings_summary"
-        android:key="hypertorus_speedwx"
-        android:summary="@array/hypertorus_speedwx_prefix"
-        android:title="@string/hypertorus_speedwx_settings_title" />
-    <ListPreference
-            android:key="hypertorus_colors"
-            android:title="@string/hypertorus_colors_settings_title"
-            android:summary="@string/hypertorus_colors_settings_summary"
-            android:entries="@array/hypertorus_colors_names"
-            android:defaultValue="@string/hypertorus_colors_default"
-            android:entryValues="@array/hypertorus_colors_prefix" />
-    <org.jwz.xscreensaver.SliderPreference
-        android:defaultValue="@string/hypertorus_speedyz_float"
-        android:dialogMessage="@string/hypertorus_speedyz_settings_summary"
-        android:key="hypertorus_speedyz"
-        android:summary="@array/hypertorus_speedyz_prefix"
-        android:title="@string/hypertorus_speedyz_settings_title" />
+        android:defaultValue="@string/hypertorus_speedwz_float"
+        android:dialogMessage="@string/hypertorus_speedwz_settings_summary"
+        android:key="hypertorus_speedwz"
+        android:summary="@array/hypertorus_speedwz_prefix"
+        android:title="@string/hypertorus_speedwz_settings_title" />
     <ListPreference
             android:key="hypertorus_displayMode"
             android:title="@string/hypertorus_displayMode_settings_title"
@@ -54,12 +16,6 @@
             android:entries="@array/hypertorus_displayMode_names"
             android:defaultValue="@string/hypertorus_displayMode_default"
             android:entryValues="@array/hypertorus_displayMode_prefix" />
-    <org.jwz.xscreensaver.SliderPreference
-        android:defaultValue="@string/hypertorus_speedwz_float"
-        android:dialogMessage="@string/hypertorus_speedwz_settings_summary"
-        android:key="hypertorus_speedwz"
-        android:summary="@array/hypertorus_speedwz_prefix"
-        android:title="@string/hypertorus_speedwz_settings_title" />
     <ListPreference
             android:key="hypertorus_projection4d"
             android:title="@string/hypertorus_projection4d_settings_title"
@@ -67,6 +23,12 @@
             android:entries="@array/hypertorus_projection4d_names"
             android:defaultValue="@string/hypertorus_projection4d_default"
             android:entryValues="@array/hypertorus_projection4d_prefix" />
+    <org.jwz.xscreensaver.SliderPreference
+        android:defaultValue="@string/hypertorus_speedwy_float"
+        android:dialogMessage="@string/hypertorus_speedwy_settings_summary"
+        android:key="hypertorus_speedwy"
+        android:summary="@array/hypertorus_speedwy_prefix"
+        android:title="@string/hypertorus_speedwy_settings_title" />
     <ListPreference
             android:key="hypertorus_appearance"
             android:title="@string/hypertorus_appearance_settings_title"
@@ -74,5 +36,43 @@
             android:entries="@array/hypertorus_appearance_names"
             android:defaultValue="@string/hypertorus_appearance_default"
             android:entryValues="@array/hypertorus_appearance_prefix" />
+    <ListPreference
+            android:key="hypertorus_colors"
+            android:title="@string/hypertorus_colors_settings_title"
+            android:summary="@string/hypertorus_colors_settings_summary"
+            android:entries="@array/hypertorus_colors_names"
+            android:defaultValue="@string/hypertorus_colors_default"
+            android:entryValues="@array/hypertorus_colors_prefix" />
+    <org.jwz.xscreensaver.SliderPreference
+        android:defaultValue="@string/hypertorus_speedxz_float"
+        android:dialogMessage="@string/hypertorus_speedxz_settings_summary"
+        android:key="hypertorus_speedxz"
+        android:summary="@array/hypertorus_speedxz_prefix"
+        android:title="@string/hypertorus_speedxz_settings_title" />
+    <org.jwz.xscreensaver.SliderPreference
+        android:defaultValue="@string/hypertorus_speedxy_float"
+        android:dialogMessage="@string/hypertorus_speedxy_settings_summary"
+        android:key="hypertorus_speedxy"
+        android:summary="@array/hypertorus_speedxy_prefix"
+        android:title="@string/hypertorus_speedxy_settings_title" />
+    <ListPreference
+            android:key="hypertorus_projection3d"
+            android:title="@string/hypertorus_projection3d_settings_title"
+            android:summary="@string/hypertorus_projection3d_settings_summary"
+            android:entries="@array/hypertorus_projection3d_names"
+            android:defaultValue="@string/hypertorus_projection3d_default"
+            android:entryValues="@array/hypertorus_projection3d_prefix" />
+    <org.jwz.xscreensaver.SliderPreference
+        android:defaultValue="@string/hypertorus_speedyz_float"
+        android:dialogMessage="@string/hypertorus_speedyz_settings_summary"
+        android:key="hypertorus_speedyz"
+        android:summary="@array/hypertorus_speedyz_prefix"
+        android:title="@string/hypertorus_speedyz_settings_title" />
+    <org.jwz.xscreensaver.SliderPreference
+        android:defaultValue="@string/hypertorus_speedwx_float"
+        android:dialogMessage="@string/hypertorus_speedwx_settings_summary"
+        android:key="hypertorus_speedwx"
+        android:summary="@array/hypertorus_speedwx_prefix"
+        android:title="@string/hypertorus_speedwx_settings_title" />
     </PreferenceCategory>
 </PreferenceScreen>