Fix selecting FreeSerif in settings.

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 1baf004ce9c396be262025739a6657bcf33ed0d5..44fd6f71330e4066c88735ca7ef4245b78b71c85 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.hughes.android.dictionary"
     android:installLocation="auto"
-    android:versionCode="33"
+    android:versionCode="34"
     android:versionName="5.0.7" >
 
     <uses-sdk

diff --git a/res/values-de/arrays.xml b/res/values-de/arrays.xml
index ee16e071807042ab3293083ff87b8cc08b2deb38..f71caa6dce4b72fbf854b8d7d702034a3672bae8 100644 (file)
--- a/res/values-de/arrays.xml
+++ b/res/values-de/arrays.xml
@@ -2,7 +2,7 @@
 <resources>
 
   <string-array name="fontKeys">
-    <item>FreeSerif.ttf.jpg</item>
+    <item>FreeSerif.otf.jpg</item>
     <item>SYSTEM</item>
     <item>SERIF</item>
     <item>SANS_SERIF</item>

diff --git a/res/values-es/arrays.xml b/res/values-es/arrays.xml
index e85359dd6c22148f70d304f2a12891653cf5ab49..cf7b657c2489fc450baac5602d170ca766d23183 100644 (file)
--- a/res/values-es/arrays.xml
+++ b/res/values-es/arrays.xml
@@ -2,7 +2,7 @@
 <resources>
 
   <string-array name="fontKeys">
-    <item>FreeSerif.ttf.jpg</item>
+    <item>FreeSerif.otf.jpg</item>
     <item>SYSTEM</item>
     <item>SERIF</item>
     <item>SANS_SERIF</item>

diff --git a/res/values-fr/arrays.xml b/res/values-fr/arrays.xml
index 56d836e6340f5feaf13a8fcd58f5ff0878595f7f..8e26f0a2b4925bfb02036429f3586f79c8c086d1 100644 (file)
--- a/res/values-fr/arrays.xml
+++ b/res/values-fr/arrays.xml
@@ -2,7 +2,7 @@
 <resources>\r
 \r
   <string-array name="fontKeys">\r
-    <item>FreeSerif.ttf.jpg</item>\r
+    <item>FreeSerif.otf.jpg</item>\r
     <item>SYSTEM</item>\r
     <item>SERIF</item>\r
     <item>SANS_SERIF</item>\r

diff --git a/res/values-it/arrays.xml b/res/values-it/arrays.xml
index ffd4abd6d251f68f6fe7b96cff79703480e0c079..caa4c3b5eb50d72bbc138d30d60581762918db19 100644 (file)
--- a/res/values-it/arrays.xml
+++ b/res/values-it/arrays.xml
@@ -2,7 +2,7 @@
 <resources>\r
 \r
   <string-array name="fontKeys">\r
-    <item>FreeSerif.ttf.jpg</item>\r
+    <item>FreeSerif.otf.jpg</item>\r
     <item>SYSTEM</item>\r
     <item>SERIF</item>\r
     <item>SANS_SERIF</item>\r

diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index d399751d86f16f4775bd382fdea958a5be1a1c04..db7948824d6581a69a01826fe69f25f95700311f 100644 (file)
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -2,7 +2,7 @@
 <resources>
 
   <string-array name="fontKeys">
-    <item>FreeSerif.ttf.jpg</item>
+    <item>FreeSerif.otf.jpg</item>
     <item>SYSTEM</item>
     <item>SERIF</item>
     <item>SANS_SERIF</item>

diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 997bc95c8702d167ce53a277513f538c1e648e01..f9cb70dedb86501892320e86cdcd8b3cd2a88c7d 100644 (file)
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -29,7 +29,7 @@
     android:title="@string/fontTitle"\r
     android:summary="@string/fontSummary"\r
     android:persistent="true"\r
-    android:defaultValue="FreeSerif.ttf.jpg"\r
+    android:defaultValue="FreeSerif.otf.jpg"\r
     android:entries="@array/fonts"\r
     android:entryValues="@array/fontKeys"\r
   />\r
@@ -76,4 +76,4 @@
     android:entryValues="@array/themeKeys"\r
   />\r
 \r
-</PreferenceScreen>  
\ No newline at end of file
+</PreferenceScreen>  \r

diff --git a/src/com/hughes/android/dictionary/DictionaryActivity.java b/src/com/hughes/android/dictionary/DictionaryActivity.java
index d6463609e4bc78f0c9414c0e11d2711c463ee688..db7e8aa7fae78e860628bba64108572d4f33557e 100644 (file)
--- a/src/com/hughes/android/dictionary/DictionaryActivity.java
+++ b/src/com/hughes/android/dictionary/DictionaryActivity.java
@@ -408,6 +408,9 @@ public class DictionaryActivity extends ActionBarActivity {
        } else if ("MONOSPACE".equals(fontName)) {
             typeface = Typeface.MONOSPACE;
         } else {
+            if ("FreeSerif.ttf.jpg".equals(fontName)) {
+                fontName = "FreeSerif.otf.jpg";
+            }
             try {
                 typeface = Typeface.createFromAsset(getAssets(), fontName);
             } catch (Exception e) {