Allow choosing more system font variations.

diff --git a/res/values-de/arrays.xml b/res/values-de/arrays.xml
index 5eb30f31bfd8c57fdc88b111aae670607f6f7a36..ee16e071807042ab3293083ff87b8cc08b2deb38 100644 (file)
--- a/res/values-de/arrays.xml
+++ b/res/values-de/arrays.xml
@@ -4,11 +4,17 @@
   <string-array name="fontKeys">
     <item>FreeSerif.ttf.jpg</item>
     <item>SYSTEM</item>
+    <item>SERIF</item>
+    <item>SANS_SERIF</item>
+    <item>MONOSPACE</item>
   </string-array>
 
   <string-array name="fonts">
     <item>FreeSerif</item>
     <item>System default</item>
+    <item>System serif</item>
+    <item>System sans-serif</item>
+    <item>System monospace</item>
   </string-array>
     
   <string-array name="themeKeys">
@@ -21,4 +27,4 @@
     <item>Standard-Theme</item>
   </string-array>
   
-</resources>
\ No newline at end of file
+</resources>

diff --git a/res/values-es/arrays.xml b/res/values-es/arrays.xml
index d3ea16839b611009afabd0549001b56ac72452eb..e85359dd6c22148f70d304f2a12891653cf5ab49 100644 (file)
--- a/res/values-es/arrays.xml
+++ b/res/values-es/arrays.xml
@@ -4,11 +4,17 @@
   <string-array name="fontKeys">
     <item>FreeSerif.ttf.jpg</item>
     <item>SYSTEM</item>
+    <item>SERIF</item>
+    <item>SANS_SERIF</item>
+    <item>MONOSPACE</item>
   </string-array>
 
   <string-array name="fonts">
     <item>FreeSerif</item>
     <item>Predeterminada del sistema</item>
+    <item>Serif del sistema</item>
+    <item>Sans-serif del sistema</item>
+    <item>Monospace del sistema</item>
   </string-array>
     
   <string-array name="themeKeys">

diff --git a/res/values-fr/arrays.xml b/res/values-fr/arrays.xml
index 9302922de2f5cd82b6970d45144563de39a5500b..56d836e6340f5feaf13a8fcd58f5ff0878595f7f 100644 (file)
--- a/res/values-fr/arrays.xml
+++ b/res/values-fr/arrays.xml
@@ -4,11 +4,17 @@
   <string-array name="fontKeys">\r
     <item>FreeSerif.ttf.jpg</item>\r
     <item>SYSTEM</item>\r
+    <item>SERIF</item>\r
+    <item>SANS_SERIF</item>\r
+    <item>MONOSPACE</item>\r
   </string-array>\r
 \r
   <string-array name="fonts">\r
     <item>FreeSerif</item>\r
     <item>System standard</item>\r
+    <item>System serif</item>\r
+    <item>System sans-serif</item>\r
+    <item>System monospace</item>\r
   </string-array>\r
     \r
   <string-array name="themeKeys">\r
@@ -21,4 +27,4 @@
     <item>theme standard</item>\r
   </string-array>\r
   \r
-</resources>
\ No newline at end of file
+</resources>\r

diff --git a/res/values-it/arrays.xml b/res/values-it/arrays.xml
index 7320c3d5486aa4503ea8a95e9769b61ee733229b..ffd4abd6d251f68f6fe7b96cff79703480e0c079 100644 (file)
--- a/res/values-it/arrays.xml
+++ b/res/values-it/arrays.xml
@@ -4,11 +4,17 @@
   <string-array name="fontKeys">\r
     <item>FreeSerif.ttf.jpg</item>\r
     <item>SYSTEM</item>\r
+    <item>SERIF</item>\r
+    <item>SANS_SERIF</item>\r
+    <item>MONOSPACE</item>\r
   </string-array>\r
 \r
   <string-array name="fonts">\r
     <item>FreeSerif</item>\r
     <item>Default di Sistema</item>\r
+    <item>Serif di Sistema</item>\r
+    <item>Sans-serif di Sistema</item>\r
+    <item>Monospace di Sistema</item>\r
   </string-array>\r
     \r
   <string-array name="themeKeys">\r

diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 8c194a3cf81efaf668902fea5e25225f542698e3..d399751d86f16f4775bd382fdea958a5be1a1c04 100644 (file)
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -4,11 +4,17 @@
   <string-array name="fontKeys">
     <item>FreeSerif.ttf.jpg</item>
     <item>SYSTEM</item>
+    <item>SERIF</item>
+    <item>SANS_SERIF</item>
+    <item>MONOSPACE</item>
   </string-array>
 
   <string-array name="fonts">
     <item>FreeSerif</item>
     <item>System default</item>
+    <item>System serif</item>
+    <item>System sans-serif</item>
+    <item>System monospace</item>
   </string-array>
     
   <string-array name="themeKeys">
@@ -21,4 +27,4 @@
     <item>Default theme</item>
   </string-array>
   
-</resources>
\ No newline at end of file
+</resources>

diff --git a/src/com/hughes/android/dictionary/DictionaryActivity.java b/src/com/hughes/android/dictionary/DictionaryActivity.java
index a37e3c472612275753c6781f8f46a846cd36bd1a..2a37b6e369f249d9694ee407d5ab2ac08e81229f 100644 (file)
--- a/src/com/hughes/android/dictionary/DictionaryActivity.java
+++ b/src/com/hughes/android/dictionary/DictionaryActivity.java
@@ -408,6 +408,12 @@ public class DictionaryActivity extends ActionBarActivity {
         String fontName = prefs.getString(getString(R.string.fontKey), "FreeSerif.ttf.jpg");
         if ("SYSTEM".equals(fontName)) {
             typeface = Typeface.DEFAULT;
+       } else if ("SERIF".equals(fontName)) {
+            typeface = Typeface.SERIF;
+       } else if ("SANS_SERIF".equals(fontName)) {
+            typeface = Typeface.SANS_SERIF;
+       } else if ("MONOSPACE".equals(fontName)) {
+            typeface = Typeface.MONOSPACE;
         } else {
             try {
                 typeface = Typeface.createFromAsset(getAssets(), fontName);