From: Thad Hughes <thadh@dhcp-172-18-100-204.mtv.corp.google.com>
Date: Fri, 9 Apr 2010 22:25:44 +0000 (-0700)
Subject: go
X-Git-Url: http://gitweb.fperrin.net/?a=commitdiff_plain;h=92dfc8b7d39cbc2e55f3c547c0c265bc7ae3af86;p=Dictionary.git

go
---

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 3107cf0..f0bfc11 100755
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,16 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-	package="com.hughes.android.dictionary" android:versionName="1.6" android:versionCode="6">
+	package="com.hughes.android.dictionary" android:versionName="1.8" android:versionCode="8">
 
-	<uses-sdk android:minSdkVersion="2" />
+	<uses-sdk android:minSdkVersion="4" />
 	<uses-permission android:name="android.permission.INTERNET"/>
+  <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+  <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
 
 	<application android:icon="@drawable/icon" android:label="@string/app_name">
-		<activity android:name=".DictionaryActivity" android:label="@string/app_name">
+		<activity android:name=".DictionaryActivity" 
+		    android:label="@string/app_name"
+		    android:windowSoftInputMode="stateVisible|adjustResize">
 			<intent-filter>
 				<action android:name="android.intent.action.MAIN" />
 				<category android:name="android.intent.category.LAUNCHER" />
 			</intent-filter>
+			
 		</activity>
 
 		<activity android:name="AboutActivity"/>
@@ -26,5 +31,5 @@
 	    android:targetPackage="com.hughes.android.dictionary"
 	    android:label="DictionaryActivityTest" />
 	    
-	    
-</manifest> 
\ No newline at end of file
+</manifest>
+ 
\ No newline at end of file
diff --git a/default.properties b/default.properties
index 0a007ab..ae7b77e 100755
--- a/default.properties
+++ b/default.properties
@@ -7,16 +7,8 @@
 # "build.properties", and override values to adapt the script to your
 # project structure.
 
+# Indicates whether an apk should be generated for each density.
+split.density=false
 # Project target.
-target=android-3
-# apk configurations. This property allows creation of APK files with limited
-# resources. For example, if your application contains many locales and
-# you wish to release multiple smaller apks instead of a large one, you can
-# define configuration to create apks with limited language sets.
-# Format is a comma separated list of configuration names. For each
-# configuration, a property will declare the resource configurations to
-# include. Example:
-#     apk-configurations=european,northamerica
-#     apk-config-european=en,fr,it,de,es
-#     apk-config-northamerica=en,es
+target=android-6
 apk-configurations=
diff --git a/res/layout/main.xml b/res/layout/main.xml
index c12bb0f..16a9728 100755
--- a/res/layout/main.xml
+++ b/res/layout/main.xml
@@ -15,7 +15,8 @@
 				android:hint="@string/searchText"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content" 
-				android:inputType="text" 
+				android:inputType="text|textNoSuggestions" 
+				android:imeOptions="actionSearch|flagNoEnterAction|flagNoExtractUi"
 				android:layout_weight="1.0"/>
 				
       <Button 
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index c461463..a8d07b5 100755
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -14,7 +14,6 @@
   <string name="failedAddingToWordList">Fehler bei Wortliste hinzufugen: %s</string>
 
 	<!-- About. -->
-	<string name="titleWithVersion">QuickDic 1.6</string>
 	<string name="thadHughes">Thad Hughes</string>
 	<string name="contactMe">Wenn QuickDic dir gefällt, würde ich gern von dir hören.  Bitte schicke Bemerkungen, Aufforderungen, oder Programmfehler an:</string>
 	<string name="myEmail">thad.hughes+quickdic@gmail.com</string>
@@ -52,7 +51,7 @@ Einträgezahl: %d\n
   <string name="saveOnlyFirstSubentrySummary">For entries with multiple sub-entries, only write the first to the word list.</string>
 
   <string name="showClearSearchTextButtonKey">showClearSearchTextButton</string>
-  <string name="showClearSearchTextButtonTitle">Show 'clear search text' button</string>
+  <string name="showClearSearchTextButtonTitle">Show \'clear search text\' button</string>
   <string name="showClearSearchTextButtonSummary">Show the button to clear the search text. You can also just move focus away from search text and start typing.</string>
   
 	<string name="dictFileKey">dictFile</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 6ffc831..ada99cb 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -14,9 +14,9 @@
   <string name="failedAddingToWordList">Failure adding to word list: %s</string>
 
 	<!-- About. -->
-	<string name="titleWithVersion">QuickDic 1.6</string>
+	<string name="titleWithVersion">QuickDic 1.8</string>
 	<string name="thadHughes">Thad Hughes</string>
-	<string name="contactMe">If you're using QuickDic, I'd love to hear from you.  Please send comments, suggestions, bug reports, or just a quick hello to:</string>
+	<string name="contactMe">If you\'re using QuickDic, I\'d love to hear from you.  Please send comments, suggestions, bug reports, or just a quick hello to:</string>
 	<string name="myEmail">thad.hughes+quickdic@gmail.com</string>
 	<string name="currentDictInfo">Current dictionary info:</string>
 	<string name="noDictLoaded">No dictionary loaded.</string>
@@ -52,7 +52,7 @@ Entry count: %d\n
   <string name="saveOnlyFirstSubentrySummary">For entries with multiple sub-entries, only write the first to the word list.</string>
 
   <string name="showClearSearchTextButtonKey">showClearSearchTextButton</string>
-  <string name="showClearSearchTextButtonTitle">Show 'clear search text' button</string>
+  <string name="showClearSearchTextButtonTitle">Show \'clear search text\' button</string>
   <string name="showClearSearchTextButtonSummary">Show the button to clear the search text. You can also just move focus away from search text and start typing.</string>
   
 	<string name="dictFileKey">dictFile</string>
diff --git a/src/com/hughes/android/dictionary/DictionaryActivity.java b/src/com/hughes/android/dictionary/DictionaryActivity.java
index 61061d5..05f292a 100755
--- a/src/com/hughes/android/dictionary/DictionaryActivity.java
+++ b/src/com/hughes/android/dictionary/DictionaryActivity.java
@@ -36,6 +36,7 @@ import android.view.ViewGroup;
 import android.view.ContextMenu.ContextMenuInfo;
 import android.view.MenuItem.OnMenuItemClickListener;
 import android.view.View.OnClickListener;
+import android.view.inputmethod.InputMethodManager;
 import android.widget.AdapterView;
 import android.widget.BaseAdapter;
 import android.widget.Button;
@@ -53,7 +54,7 @@ import com.ibm.icu.text.Collator;
 
 public class DictionaryActivity extends ListActivity {
   
-  // TODO:
+  // TO DO:
   // * Download latest dicts.
   //   * http://ftp.tu-chemnitz.de/pub/Local/urz/ding/de-en-devel/
   //   * http://www1.dict.cc/translation_file_request.php?l=e
@@ -144,9 +145,7 @@ public class DictionaryActivity extends ListActivity {
     final Button clearSearchTextButton = (Button) findViewById(R.id.ClearSearchTextButton);
     clearSearchTextButton.setOnClickListener(new OnClickListener() {
       public void onClick(View v) {
-        clearSearchTextButton.requestFocus();
-        searchText.setText("");
-        searchText.requestFocus();
+        onClearSearchTextButton(clearSearchTextButton);
       }
     });
     clearSearchTextButton.setVisibility(PreferenceManager.getDefaultSharedPreferences(this).getBoolean(
@@ -448,12 +447,19 @@ public class DictionaryActivity extends ListActivity {
   void onSearchTextChange(final String searchText) {
     Log.d(LOG, "onSearchTextChange: " + searchText);
     synchronized (this) {
-      searchOperation = new SearchOperation(languageList, searchText, searchOperation);
+      searchOperation = new SearchOperation(languageList, searchText.trim(), searchOperation);
       searchExecutor.execute(searchOperation);
     }
   }
 
-  
+  private void onClearSearchTextButton(final Button clearSearchTextButton) {
+    clearSearchTextButton.requestFocus();
+    searchText.setText("");
+    searchText.requestFocus();
+    Log.d(LOG, "Trying to show soft keyboard.");
+    final InputMethodManager manager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+    manager.showSoftInput(searchText, InputMethodManager.SHOW_IMPLICIT);
+  }
 
   // ----------------------------------------------------------------
   // ContextMenu
diff --git a/src/com/hughes/android/dictionary/Language.java b/src/com/hughes/android/dictionary/Language.java
index d8fa360..0c4b2c5 100755
--- a/src/com/hughes/android/dictionary/Language.java
+++ b/src/com/hughes/android/dictionary/Language.java
@@ -12,7 +12,7 @@ public class Language {
   final String symbol;
   final Locale locale;
 
-  private Collator sortCollator;
+  Collator sortCollator;
   final Comparator<String> sortComparator;
 
   private Collator findCollator;
diff --git a/src/com/hughes/android/dictionary/NoDictionaryActivity.java b/src/com/hughes/android/dictionary/NoDictionaryActivity.java
index f7fb10f..2e3cfbe 100755
--- a/src/com/hughes/android/dictionary/NoDictionaryActivity.java
+++ b/src/com/hughes/android/dictionary/NoDictionaryActivity.java
@@ -51,7 +51,7 @@ public class NoDictionaryActivity extends Activity {
     if (!canReadDict) {
       statusText.setText(getString(R.string.unableToReadDictionaryFile, dictFile));
     } else {
-      statusText.setText(getString(R.string.dictionaryFileExists));
+      statusText.setText(getString(R.string.dictionaryFileExists, dictFile));
     }
 
     final Button launchButton = (Button) findViewById(R.id.launchDict);