From a055815b709882a12a90fa16243fbf29c0759c21 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Mon, 16 Mar 2015 07:10:41 -0700
Subject: [PATCH] fix so prefs doesn't crash when pct_suffix is translated

---
 xwords4/android/XWords4/res/values-fr/strings.xml     |  2 +-
 xwords4/android/XWords4/res/xml/xwprefs.xml           |  3 +--
 .../eehouse/android/xw4/XWThumbListPreference.java    | 11 +++++++----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/xwords4/android/XWords4/res/values-fr/strings.xml b/xwords4/android/XWords4/res/values-fr/strings.xml
index a263f8b52..fed1fefd1 100644
--- a/xwords4/android/XWords4/res/values-fr/strings.xml
+++ b/xwords4/android/XWords4/res/values-fr/strings.xml
@@ -2682,7 +2682,7 @@ pouvez utiliser l\'application des Paramètres Android pour l\'allumer.</string>
     <string name="sms_ready_text">Toucher le périphérique récepteur maintenant</string>
 
     <!--<string name="pct_suffix">\u0020pct.</string>-->
-    <string name="pct_suffix">\u0020pct.</string>
+    <string name="pct_suffix">\u0020prct.</string>
 
     <!--<string name="menu_rateme">Rate Crosswords</string>-->
     <string name="menu_rateme">Évaluer Crosswords</string>
diff --git a/xwords4/android/XWords4/res/xml/xwprefs.xml b/xwords4/android/XWords4/res/xml/xwprefs.xml
index 8c0a1be73..d0459ba4f 100644
--- a/xwords4/android/XWords4/res/xml/xwprefs.xml
+++ b/xwords4/android/XWords4/res/xml/xwprefs.xml
@@ -102,11 +102,10 @@
                     android:key="@string/prefs_appearance"
                     >
 
-    <!-- " pct." below must match R.string.pct_suffix -->
     <org.eehouse.android.xw4.XWThumbListPreference 
         android:key="@string/key_thumbsize"
         android:title="@string/summary_thumbsize"
-        android:defaultValue="30 pct."
+        android:defaultValue="30"
         />
 
     <org.eehouse.android.xw4.XWSumListPreference 
diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWThumbListPreference.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWThumbListPreference.java
index 2fdf74c5c..163a2583e 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWThumbListPreference.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWThumbListPreference.java
@@ -40,11 +40,14 @@ public class XWThumbListPreference extends XWListPreference {
         super.onAttachedToActivity();
 
         CharSequence[] newEntries = new CharSequence[7];
-        int indx = 0;
-        newEntries[indx++] = LocUtils.getString( m_context, R.string.thumb_off );
+        newEntries[0] = LocUtils.getString( m_context, R.string.thumb_off );
+        CharSequence[] newEntryValues = new CharSequence[7];
+        newEntryValues[0] = "0";
         String suffix = LocUtils.getString( m_context, R.string.pct_suffix );
-        for ( int pct = 20; pct <= 45; pct += 5 ) {
-            newEntries[indx++] = String.format( "%d%s", pct, suffix );
+        for ( int ii = 1; ii < newEntries.length; ++ii ) {
+            int pct = 15 + (ii * 5);
+            newEntries[ii] = String.format( "%d%s", pct, suffix );
+            newEntryValues[ii] = String.format( "%d", pct );
         }
         setEntries( newEntries );
         setEntryValues( newEntries );