From 5a555b11b084bf1363af7c6d97fe07b5a5f04f68 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Fri, 8 Nov 2013 05:54:30 -0800
Subject: [PATCH] tweak appearance of snapshots preferences

---
 .../XWords4/res/values/common_rsrc.xml        |  2 +-
 .../android/XWords4/res/values/strings.xml    |  8 +--
 xwords4/android/XWords4/res/xml/xwprefs.xml   | 49 ++++++++++---------
 .../src/org/eehouse/android/xw4/XWPrefs.java  |  2 +-
 4 files changed, 31 insertions(+), 30 deletions(-)

diff --git a/xwords4/android/XWords4/res/values/common_rsrc.xml b/xwords4/android/XWords4/res/values/common_rsrc.xml
index a7dd9bebb..fe8db7947 100644
--- a/xwords4/android/XWords4/res/values/common_rsrc.xml
+++ b/xwords4/android/XWords4/res/values/common_rsrc.xml
@@ -58,7 +58,7 @@
   <string name="key_enable_sms">key_enable_sms</string>
   <string name="key_keep_screenon">key_keep_screenon</string>
   <string name="key_thumbsize">key_thumbsize2</string>
-  <string name="key_thumb_disabled">key_thumb_disabled</string>
+  <string name="key_thumb_enabled">key_thumb_disabled</string>
   <string name="key_thumb_useactive">key_thumb_useactive</string>
 
   <string name="key_summary_field">key_summary_field</string>
diff --git a/xwords4/android/XWords4/res/values/strings.xml b/xwords4/android/XWords4/res/values/strings.xml
index 86d7c9587..99746b501 100644
--- a/xwords4/android/XWords4/res/values/strings.xml
+++ b/xwords4/android/XWords4/res/values/strings.xml
@@ -2159,12 +2159,12 @@
     <string name="summary_thumbsize">Thumbnail size</string>
     <string name="sel_dictsf">Wordlists: %d</string>
 
-    <string name="thumb_disabled">Thumb disabled</string>
-    <string name="summary_thumb_disabled">Summary thumb disbled</string>
+    <string name="thumb_enabled">Show thumbnails</string>
+    <string name="summary_thumb_enabled">Display snapshots of games</string>
     <string name="thumb_useactive">thumb_useactive</string>
     <string name="summary_thumb_useactive">summary_thumb_useactive</string>
 
-    <string name="prefs_thumb">Thumbnail prefs</string>
-    <string name="prefs_thumb_summary">prefs_thumb_summary</string>
+    <string name="prefs_thumb">Thumbnails</string>
+    <string name="prefs_thumb_summary">Setting for game snapshots</string>
     
 </resources>
diff --git a/xwords4/android/XWords4/res/xml/xwprefs.xml b/xwords4/android/XWords4/res/xml/xwprefs.xml
index 777f744df..845c35268 100644
--- a/xwords4/android/XWords4/res/xml/xwprefs.xml
+++ b/xwords4/android/XWords4/res/xml/xwprefs.xml
@@ -110,6 +110,30 @@
   <PreferenceScreen android:title="@string/prefs_appearance"
                     android:summary="@string/prefs_appearance_summary"
                     >
+    <PreferenceScreen android:title="@string/prefs_thumb"
+                      android:summary="@string/prefs_thumb_summary"
+                      >
+        <CheckBoxPreference android:key="@string/key_thumb_enabled"
+                            android:title="@string/thumb_enabled"
+                            android:summary="@string/summary_thumb_enabled"
+                            android:defaultValue="true"
+                            />
+
+        <CheckBoxPreference android:key="@string/key_thumb_useactive"
+                            android:title="@string/thumb_useactive"
+                            android:summary="@string/summary_thumb_useactive"
+                            android:defaultValue="false"
+                            />
+
+        <org.eehouse.android.xw4.XWListPreference 
+             android:key="@string/key_thumbsize"
+             android:title="@string/summary_thumbsize"
+             android:entries="@array/game_thumb_values"
+             android:entryValues="@array/game_thumb_values"
+             android:defaultValue="@string/game_thumb_third"
+             />
+    </PreferenceScreen>
+
     <org.eehouse.android.xw4.XWListPreference 
        android:key="@string/key_summary_field"
        android:title="@string/summary_field"
@@ -117,6 +141,7 @@
 	   android:entryValues="@array/game_summary_values"
        android:defaultValue="@string/game_summary_field_opponents"
        />
+
     <CheckBoxPreference android:key="@string/key_hide_title"
                         android:title="@string/hide_title"
                         android:summary="@string/hide_title_summary"
@@ -138,30 +163,6 @@
                         android:defaultValue="false"
                         />
 
-    <PreferenceScreen android:title="@string/prefs_thumb"
-                      android:summary="@string/prefs_thumb_summary"
-                      >
-        <CheckBoxPreference android:key="@string/key_thumb_disabled"
-                            android:title="@string/thumb_disabled"
-                            android:summary="@string/summary_thumb_disabled"
-                            android:defaultValue="false"
-                            />
-
-        <CheckBoxPreference android:key="@string/key_thumb_useactive"
-                            android:title="@string/thumb_useactive"
-                            android:summary="@string/summary_thumb_useactive"
-                            android:defaultValue="false"
-                            />
-
-        <org.eehouse.android.xw4.XWListPreference 
-             android:key="@string/key_thumbsize"
-             android:title="@string/summary_thumbsize"
-             android:entries="@array/game_thumb_values"
-             android:entryValues="@array/game_thumb_values"
-             android:defaultValue="@string/game_thumb_third"
-             />
-    </PreferenceScreen>
-
     <PreferenceScreen android:title="@string/prefs_colors"
                       android:summary="@string/prefs_colors_summary"
                       >
diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWPrefs.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWPrefs.java
index bb768e55b..5ca6c1e73 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWPrefs.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWPrefs.java
@@ -330,7 +330,7 @@ public class XWPrefs {
 
     public static boolean getThumbEnabled( Context context )
     {
-        return !getPrefsBoolean( context, R.string.key_thumb_disabled, false );
+        return getPrefsBoolean( context, R.string.key_thumb_enabled, false );
     }
 
     public static boolean getUseActiveRect( Context context )