From: Thad Hughes <thad.hughes@gmail.com>
Date: Thu, 10 May 2012 04:04:42 +0000 (-0700)
Subject: Added new GNU FreeFonts.
X-Git-Url: http://gitweb.fperrin.net/?p=Dictionary.git;a=commitdiff_plain;h=35ba2fd6a243fa8bb8298fe5459b77196940efc7

Added new GNU FreeFonts.
---

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index ca1e53f..f8d3880 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -8,7 +8,7 @@
  android:versionName="3.2.2"
  android:installLocation="auto">
 
- <uses-sdk android:minSdkVersion="4" android:targetSdkVersion="15"/>
+ <uses-sdk android:minSdkVersion="4" android:targetSdkVersion="4"/>
  
    <!--
     Because android:minSdkVersion is 3, these parameters default to
diff --git a/assets/FreeSans.ttf b/assets/FreeSans.ttf
deleted file mode 100644
index 9db9585..0000000
Binary files a/assets/FreeSans.ttf and /dev/null differ
diff --git a/assets/FreeSans.ttf.jpg b/assets/FreeSans.ttf.jpg
new file mode 100644
index 0000000..2072cda
Binary files /dev/null and b/assets/FreeSans.ttf.jpg differ
diff --git a/assets/FreeSerif.ttf.jpg b/assets/FreeSerif.ttf.jpg
index b8906f5..889c594 100644
Binary files a/assets/FreeSerif.ttf.jpg and b/assets/FreeSerif.ttf.jpg differ
diff --git a/res/layout/dictionary_manager_activity.xml b/res/layout/dictionary_manager_activity.xml
index 5fc34ce..b6f67f9 100644
--- a/res/layout/dictionary_manager_activity.xml
+++ b/res/layout/dictionary_manager_activity.xml
@@ -37,12 +37,10 @@
     android:layout_weight="1.0"
     />
 
-   <EditText 
+   <TextView 
      android:id="@+id/DictionaryListHeader"
      android:hint="@string/helpText"
      android:layout_width="fill_parent"
-     android:layout_height="wrap_content" 
-     android:imeOptions="actionSearch|flagNoEnterAction|flagNoExtractUi"
-     android:inputType="text"/>
+     android:layout_height="wrap_content"/>
 
 </LinearLayout>
diff --git a/res/values-de/arrays.xml b/res/values-de/arrays.xml
index 346897f..b052204 100644
--- a/res/values-de/arrays.xml
+++ b/res/values-de/arrays.xml
@@ -3,7 +3,7 @@
 
   <string-array name="fontKeys">
     <item>FreeSerif.ttf.jpg</item>
-    <item>FreeSans.ttf</item>
+    <item>FreeSans.ttf.jpg</item>
     <item>SYSTEM</item>
   </string-array>
 
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 73b5acc..fd4c1d6 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -3,7 +3,7 @@
 
   <string-array name="fontKeys">
     <item>FreeSerif.ttf.jpg</item>
-    <item>FreeSans.ttf</item>
+    <item>FreeSans.ttf.jpg</item>
     <item>SYSTEM</item>
   </string-array>
 
diff --git a/res/values/strings.xml b/res/values/strings.xml
index d6b5977..170880b 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -15,7 +15,7 @@
   
    <!-- DictionaryManagerActivity -->
   <string name="dictionaryManager">Dictionary manager</string>
-  <string name="helpText">Long-press for more options.</string>
+  <string name="helpText">Long-press a dictionary for more options.</string>
   <string name="downloadButton">Download (%.1fMB)</string>
   <string name="updateButton">Update (%.1fMB)</string>
   <string name="moveToTop">Move to top</string>