Added filtering to manager, remove timeout on auto-launch (and finish

[Dictionary.git] / src / com / hughes / android / dictionary / DictionaryActivity.java

diff --git a/src/com/hughes/android/dictionary/DictionaryActivity.java b/src/com/hughes/android/dictionary/DictionaryActivity.java
index 052018a469a30325535da42a717e26662b10c302..3b01133c0f4bf999e762c3080c2365cd40ea1cac 100644 (file)
--- a/src/com/hughes/android/dictionary/DictionaryActivity.java
+++ b/src/com/hughes/android/dictionary/DictionaryActivity.java
@@ -444,11 +444,33 @@ public class DictionaryActivity extends ListActivity {
     dialog.setTitle(R.string.selectDictionary);\r
 \r
     final List<DictionaryInfo> installedDicts = ((DictionaryApplication)getApplication()).getUsableDicts();\r
+    \r
     ListView listView = (ListView) dialog.findViewById(android.R.id.list);\r
+\r
+//    final LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);\r
+//    layoutParams.width = 0;\r
+//    layoutParams.weight = 1.0f;\r
+\r
+    final Button button = new Button(listView.getContext());\r
+    final String name = getString(R.string.dictionaryManager);\r
+    button.setText(name);\r
+    final IntentLauncher intentLauncher = new IntentLauncher(listView.getContext(), DictionaryManagerActivity.getLaunchIntent()) {\r
+      @Override\r
+      protected void onGo() {\r
+        dialog.dismiss();\r
+        DictionaryActivity.this.finish();\r
+      };\r
+    };\r
+    button.setOnClickListener(intentLauncher);\r
+//    button.setLayoutParams(layoutParams);\r
+    listView.addHeaderView(button);\r
+//    listView.setHeaderDividersEnabled(true);\r
+    \r
     listView.setAdapter(new BaseAdapter() {\r
       @Override\r
       public View getView(int position, View convertView, ViewGroup parent) {\r
         final LinearLayout result = new LinearLayout(parent.getContext());\r
+\r
         final DictionaryInfo dictionaryInfo = getItem(position);\r
           final Button button = new Button(parent.getContext());\r
           final String name = application.getDictionaryName(dictionaryInfo.uncompressedFilename);\r
@@ -461,12 +483,10 @@ public class DictionaryActivity extends ListActivity {
             };\r
           };\r
           button.setOnClickListener(intentLauncher);\r
-          \r
           final LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);\r
           layoutParams.width = 0;\r
           layoutParams.weight = 1.0f;\r
           button.setLayoutParams(layoutParams);\r
-\r
           result.addView(button);\r
         return result;\r
       }\r
@@ -747,9 +767,9 @@ public class DictionaryActivity extends ListActivity {
       return true;\r
     }\r
     if (keyCode == KeyEvent.KEYCODE_BACK) {\r
-      Log.d(LOG, "Clearing dictionary prefs.");\r
+      //Log.d(LOG, "Clearing dictionary prefs.");\r
       // Pretend that we just autolaunched so that we won't do it again.\r
-      DictionaryManagerActivity.lastAutoLaunchMillis = System.currentTimeMillis();\r
+      //DictionaryManagerActivity.lastAutoLaunchMillis = System.currentTimeMillis();\r
     }\r
     if (keyCode == KeyEvent.KEYCODE_ENTER) {\r
       Log.d(LOG, "Trying to hide soft keyboard.");\r