]> gitweb.fperrin.net Git - Dictionary.git/blobdiff - src/com/hughes/android/dictionary/DictionaryActivity.java
Organize imports, fix Lint deprecation warnings (or add flags where
[Dictionary.git] / src / com / hughes / android / dictionary / DictionaryActivity.java
old mode 100755 (executable)
new mode 100644 (file)
index bc6ad40..fdc224d
+// Copyright 2011 Google Inc. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 package com.hughes.android.dictionary;
 
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.RandomAccessFile;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.concurrent.Executor;
-import java.util.concurrent.Executors;
-import java.util.concurrent.atomic.AtomicBoolean;
+import com.hughes.android.dictionary.DictionaryInfo.IndexInfo;
+import com.hughes.android.dictionary.engine.Dictionary;
+import com.hughes.android.dictionary.engine.EntrySource;
+import com.hughes.android.dictionary.engine.HtmlEntry;
+import com.hughes.android.dictionary.engine.Index;
+import com.hughes.android.dictionary.engine.Index.IndexEntry;
+import com.hughes.android.dictionary.engine.PairEntry;
+import com.hughes.android.dictionary.engine.PairEntry.Pair;
+import com.hughes.android.dictionary.engine.RowBase;
+import com.hughes.android.dictionary.engine.TokenRow;
+import com.hughes.android.dictionary.engine.TransliteratorManager;
+import com.hughes.android.util.IntentLauncher;
+import com.hughes.android.util.NonLinkClickableSpan;
 
-import android.app.AlertDialog;
+import android.app.Dialog;
 import android.app.ListActivity;
-import android.content.DialogInterface;
+import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.graphics.Typeface;
+import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
 import android.preference.PreferenceManager;
+import android.text.ClipboardManager;
 import android.text.Editable;
+import android.text.Selection;
 import android.text.Spannable;
 import android.text.TextWatcher;
+import android.text.method.LinkMovementMethod;
 import android.text.style.StyleSpan;
 import android.util.Log;
+import android.util.TypedValue;
 import android.view.ContextMenu;
+import android.view.ContextMenu.ContextMenuInfo;
 import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuItem;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.ContextMenu.ContextMenuInfo;
 import android.view.MenuItem.OnMenuItemClickListener;
+import android.view.MotionEvent;
+import android.view.View;
 import android.view.View.OnClickListener;
+import android.view.View.OnLongClickListener;
+import android.view.ViewGroup;
+import android.view.WindowManager;
+import android.view.inputmethod.InputMethodManager;
 import android.widget.AdapterView;
+import android.widget.AdapterView.AdapterContextMenuInfo;
 import android.widget.BaseAdapter;
 import android.widget.Button;
 import android.widget.EditText;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.ListAdapter;
 import android.widget.ListView;
 import android.widget.TableLayout;
 import android.widget.TableRow;
 import android.widget.TextView;
-import android.widget.AdapterView.OnItemLongClickListener;
-import android.widget.AdapterView.OnItemSelectedListener;
+import android.widget.Toast;
 
-import com.hughes.android.dictionary.Dictionary.IndexEntry;
-import com.hughes.android.dictionary.Dictionary.LanguageData;
-import com.hughes.android.dictionary.Dictionary.Row;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.RandomAccessFile;
+import java.text.SimpleDateFormat;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Date;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Random;
+import java.util.Set;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 public class DictionaryActivity extends ListActivity {
 
-  String WORD_LIST_FILE; 
-  String DICT_FILE; 
-  String DICT_FETCH_URL; 
+  static final String LOG = "QuickDic";
+
+  private String initialSearchText;
+
+  DictionaryApplication application;
+  File dictFile = null;
+  RandomAccessFile dictRaf = null;
+  Dictionary dictionary = null;
+  int indexIndex = 0;
+  Index index = null;
+  List<RowBase> rowsToShow = null;  // if not null, just show these rows.
   
-  static final Intent preferencesIntent = new Intent().setClassName(PreferenceActivity.class.getPackage().getName(), PreferenceActivity.class.getCanonicalName());
+  // package for test.
+  final Handler uiHandler = new Handler();
+  private final Executor searchExecutor = Executors.newSingleThreadExecutor(new ThreadFactory() {
+    @Override
+    public Thread newThread(Runnable r) {
+      return new Thread(r, "searchExecutor");
+    }
+  });
+  private SearchOperation currentSearchOperation = null;
 
-  private final Handler uiHandler = new Handler();
-  private final Executor searchExecutor = Executors.newSingleThreadExecutor();
-  private final DictionaryListAdapter dictionaryListAdapter = new DictionaryListAdapter();
+  C.Theme theme = C.Theme.LIGHT;
+  Typeface typeface;
+  int fontSizeSp;
+  EditText searchText;
+  Button langButton;
 
   // Never null.
-  private File wordList = new File("/sdcard/wordList.txt");
-
-  // Can be null.
-  private File dictFile = null;
-  private RandomAccessFile dictRaf = null;
-  private Dictionary dictionary = null;
-  private LanguageData activeLangaugeData = null;
+  private File wordList = null;
+  private boolean saveOnlyFirstSubentry = false;
+  private boolean clickOpensContextMenu = false;
 
-  private SearchOperation searchOperation = null;
-  private int selectedRowIndex = -1;
-  private int selectedTokenRowIndex = -1;
+  // Visible for testing.
+  ListAdapter indexAdapter = null;
+  
+  final SearchTextWatcher searchTextWatcher = new SearchTextWatcher();
   
+  /**
+   * For some languages, loading the transliterators used in this search takes
+   * a long time, so we fire it up on a different thread, and don't invoke it
+   * from the main thread until it's already finished once.
+   */
+  private volatile boolean indexPrepFinished = false;
 
-  /** Called when the activity is first created. */
-  @Override
-  public void onCreate(Bundle savedInstanceState) {
-    super.onCreate(savedInstanceState);
-    WORD_LIST_FILE = getResources().getString(R.string.wordListFileKey); 
-    DICT_FILE = getResources().getString(R.string.dictFileKey); 
-    DICT_FETCH_URL = getResources().getString(R.string.dictFetchUrlKey); 
 
-    Log.d("THAD", "onCreate");
+
+  public DictionaryActivity() {
+  }
+  
+  public static Intent getLaunchIntent(final File dictFile, final int indexIndex, final String searchToken) {
+    final Intent intent = new Intent();
+    intent.setClassName(DictionaryActivity.class.getPackage().getName(), DictionaryActivity.class.getName());
+    intent.putExtra(C.DICT_FILE, dictFile.getPath());
+    intent.putExtra(C.INDEX_INDEX, indexIndex);
+    intent.putExtra(C.SEARCH_TOKEN, searchToken);
+    return intent;
   }
   
   @Override
-  public void onResume() {
-    super.onResume();
+  protected void onSaveInstanceState(final Bundle outState) {
+    super.onSaveInstanceState(outState);
+    Log.d(LOG, "onSaveInstanceState: " + searchText.getText().toString());
+    outState.putInt(C.INDEX_INDEX, indexIndex);
+    outState.putString(C.SEARCH_TOKEN, searchText.getText().toString());
+  }
 
-    // Have to close, because we might have downloaded a new copy of the dictionary.
-    closeCurrentDictionary();
-
-    final SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(this);
-    wordList = new File(settings.getString(WORD_LIST_FILE, wordList.getAbsolutePath()));
-    final File newDictFile = new File(settings.getString(DICT_FILE, "/sdcard/de-en.dict"));
-    dictFile = newDictFile;
-    Log.d("THAD", "wordList=" + wordList);
-    Log.d("THAD", "dictFile=" + dictFile);
-
-    if (!dictFile.canRead()) {
-      dictionaryListAdapter.notifyDataSetChanged();
-      Log.d("THAD", "Unable to read dictionary file.");
-      final AlertDialog alert = new AlertDialog.Builder(DictionaryActivity.this).create();
-      alert.setMessage("Unable to read dictionary file: " + dictFile.getAbsolutePath());
-      alert.setButton("Download dictionary", new DialogInterface.OnClickListener() {
-        public void onClick(DialogInterface dialog, int which) {
-          startDownloadDictActivity();
-        }});
-      alert.show();
-      return;
-    }
+  @Override
+  protected void onRestoreInstanceState(final Bundle outState) {
+    super.onRestoreInstanceState(outState);
+    Log.d(LOG, "onRestoreInstanceState: " + outState.getString(C.SEARCH_TOKEN));
+    onCreate(outState);
+  }
+
+  @Override
+  public void onCreate(Bundle savedInstanceState) {
+    final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
+    prefs.edit().remove(C.INDEX_INDEX).commit();  // Don't auto-launch if this fails.
+
+    setTheme(((DictionaryApplication)getApplication()).getSelectedTheme().themeId);
+
+    Log.d(LOG, "onCreate:" + this);
+    super.onCreate(savedInstanceState);
+
+    application = (DictionaryApplication) getApplication();
+    theme = application.getSelectedTheme();
+    
+    final Intent intent = getIntent();
+    dictFile = new File(intent.getStringExtra(C.DICT_FILE));
     
     try {
+      final String name = application.getDictionaryName(dictFile.getName());
+      this.setTitle("QuickDic: " + name);
       dictRaf = new RandomAccessFile(dictFile, "r");
-      dictionary = new Dictionary(dictRaf);
-      activeLangaugeData = dictionary.languageDatas[Entry.LANG1];
-      dictionaryListAdapter.notifyDataSetChanged();
+      dictionary = new Dictionary(dictRaf); 
     } catch (Exception e) {
-      throw new RuntimeException(e);
+      Log.e(LOG, "Unable to load dictionary.", e);
+      if (dictRaf != null) {
+        try {
+          dictRaf.close();
+        } catch (IOException e1) {
+          Log.e(LOG, "Unable to close dictRaf.", e1);
+        }
+        dictRaf = null;
+      }
+      Toast.makeText(this, getString(R.string.invalidDictionary, "", e.getMessage()), Toast.LENGTH_LONG).show();
+      startActivity(DictionaryManagerActivity.getLaunchIntent());
+      finish();
+      return;
     }
+    indexIndex = intent.getIntExtra(C.INDEX_INDEX, 0);
+    if (savedInstanceState != null) {
+      indexIndex = savedInstanceState.getInt(C.INDEX_INDEX, indexIndex);
+    }
+    indexIndex %= dictionary.indices.size();
+    Log.d(LOG, "Loading index " + indexIndex);
+    index = dictionary.indices.get(indexIndex);
+    setListAdapter(new IndexAdapter(index));
+    
+    // Pre-load the collators.
+    new Thread(new Runnable() {
+      public void run() {
+        final long startMillis = System.currentTimeMillis();
+        try {
+          TransliteratorManager.init(new TransliteratorManager.Callback() {
+            @Override
+            public void onTransliteratorReady() {
+              uiHandler.post(new Runnable() {
+                @Override
+                public void run() {
+                  onSearchTextChange(searchText.getText().toString());
+                }
+              });
+            }
+          });
+          
+          for (final Index index : dictionary.indices) {
+            final String searchToken = index.sortedIndexEntries.get(0).token;
+            final IndexEntry entry = index.findExact(searchToken);
+            if (!searchToken.equals(entry.token)) {
+              Log.e(LOG, "Couldn't find token: " + searchToken + ", " + entry.token);
+            }
+          }
+          indexPrepFinished = true;
+        } catch (Exception e) {
+          Log.w(LOG, "Exception while prepping.  This can happen if dictionary is closed while search is happening.");
+        }
+          Log.d(LOG, "Prepping indices took:"
+              + (System.currentTimeMillis() - startMillis));
+      }
+    }).start();
+    
+    
+    String fontName = prefs.getString(getString(R.string.fontKey), "FreeSerif.ttf.jpg");
+    if ("SYSTEM".equals(fontName)) {
+      typeface = Typeface.DEFAULT;
+    } else {
+      try {
+        typeface = Typeface.createFromAsset(getAssets(), fontName);
+      } catch (Exception e) {
+        Log.w(LOG, "Exception trying to use typeface, using default.", e);
+        Toast.makeText(this, getString(R.string.fontFailure, e.getLocalizedMessage()), Toast.LENGTH_LONG).show();
+      }
+    }
+//    if (!"SYSTEM".equals(fontName)) {
+//      throw new RuntimeException("Test force using system font: " + fontName);
+//    }
+    if (typeface == null) {
+      Log.w(LOG, "Unable to create typeface, using default.");
+      typeface = Typeface.DEFAULT;
+    }
+    final String fontSize = prefs.getString(getString(R.string.fontSizeKey), "14");
+    try {
+      fontSizeSp = Integer.parseInt(fontSize.trim());
+    } catch (NumberFormatException e) {
+      fontSizeSp = 14;
+    } 
 
-    setContentView(R.layout.main);
-
-    getSearchText().addTextChangedListener(new DictionaryTextWatcher());
-
-    setListAdapter(dictionaryListAdapter);
 
-    // Language button.
+    setContentView(R.layout.dictionary_activity);
+    searchText = (EditText) findViewById(R.id.SearchText);
+    searchText.setTypeface(typeface);
+    searchText.setTextSize(TypedValue.COMPLEX_UNIT_SP, fontSizeSp);
+    
+    langButton = (Button) findViewById(R.id.LangButton);
+    
+    searchText.requestFocus();
+    searchText.addTextChangedListener(searchTextWatcher);
+    
+    // Set the search text from the intent, then the saved state.
+    String text = getIntent().getStringExtra(C.SEARCH_TOKEN);
+    if (savedInstanceState != null) {
+      text = savedInstanceState.getString(C.SEARCH_TOKEN);
+    }
+    if (text == null) {
+      text = "";
+    }
+    setSearchText(text, true);
+    Log.d(LOG, "Trying to restore searchText=" + text);
+    
+    final Button clearSearchTextButton = (Button) findViewById(R.id.ClearSearchTextButton);
+    clearSearchTextButton.setOnClickListener(new OnClickListener() {
+      public void onClick(View v) {
+        onClearSearchTextButton(clearSearchTextButton);
+      }
+    });
+    clearSearchTextButton.setVisibility(PreferenceManager.getDefaultSharedPreferences(this).getBoolean(
+        getString(R.string.showClearSearchTextButtonKey), true) ? View.VISIBLE
+        : View.GONE);
+    
     final Button langButton = (Button) findViewById(R.id.LangButton);
     langButton.setOnClickListener(new OnClickListener() {
       public void onClick(View v) {
-        switchLanguage();
-      }});
+        onLanguageButton();
+      }
+    });
+    langButton.setOnLongClickListener(new OnLongClickListener() {
+      @Override
+      public boolean onLongClick(View v) {
+        onLanguageButtonLongClick(v.getContext());
+        return true;
+      }
+    });
     updateLangButton();
-
+    
     final Button upButton = (Button) findViewById(R.id.UpButton);
     upButton.setOnClickListener(new OnClickListener() {
       public void onClick(View v) {
-        if (dictionary == null) {
-          return;
-        }
-        final int destRowIndex;
-        final Row tokenRow = activeLangaugeData.rows.get(selectedTokenRowIndex);
-        assert tokenRow.isToken();
-        final int prevTokenIndex = tokenRow.getIndex() - 1;
-        if (selectedRowIndex == selectedTokenRowIndex && selectedRowIndex > 0) {
-          destRowIndex = activeLangaugeData.sortedIndex.get(prevTokenIndex).startRow;
-        } else {
-          destRowIndex = selectedTokenRowIndex;
-        }
-        jumpToRow(destRowIndex);
-      }});
+        onUpDownButton(true);
+      }
+    });
     final Button downButton = (Button) findViewById(R.id.DownButton);
     downButton.setOnClickListener(new OnClickListener() {
       public void onClick(View v) {
-        if (dictionary == null) {
-          return;
-        }
-        final Row tokenRow = activeLangaugeData.rows.get(selectedTokenRowIndex);
-        assert tokenRow.isToken();
-        final int nextTokenIndex = tokenRow.getIndex() + 1;
-        final int destRowIndex;
-        if (nextTokenIndex < activeLangaugeData.sortedIndex.size()) {
-          destRowIndex = activeLangaugeData.sortedIndex.get(nextTokenIndex).startRow;
-        } else {
-          destRowIndex = activeLangaugeData.rows.size() - 1;
-        }
-        jumpToRow(destRowIndex);
-      }});
-
-    // ContextMenu.
-    registerForContextMenu(getListView());
+        onUpDownButton(false);
+      }
+    });
 
-    // ItemSelectedListener.
-    getListView().setOnItemSelectedListener(new OnItemSelectedListener() {
-      public void onItemSelected(AdapterView<?> arg0, View arg1, int rowIndex,
-          long arg3) {
-        Log.d("THAD", "onItemSelected: " + rowIndex);
-        selectedRowIndex = rowIndex;
-        selectedTokenRowIndex = activeLangaugeData.getIndexEntryForRow(rowIndex).startRow;
-        updateSearchText();
+   getListView().setOnItemSelectedListener(new ListView.OnItemSelectedListener() {
+      @Override
+      public void onItemSelected(AdapterView<?> adapterView, View arg1, final int position,
+          long id) {
+        if (!searchText.isFocused()) {
+          if (!isFiltered()) {
+            final RowBase row = (RowBase) getListAdapter().getItem(position);
+            Log.d(LOG, "onItemSelected: " + row.index());
+            final TokenRow tokenRow = row.getTokenRow(true);
+            searchText.setText(tokenRow.getToken());
+          }
+        }
       }
 
+      @Override
       public void onNothingSelected(AdapterView<?> arg0) {
-      }});
-    
-
-    // LongClickListener.
-    getListView().setOnItemLongClickListener((new OnItemLongClickListener() {
-      public boolean onItemLongClick(AdapterView<?> arg0, View arg1, int rowIndex,
-          long arg3) {
-        selectedRowIndex = rowIndex;
-        return false;
       }
-    }));
+    });
+
+    // ContextMenu.
+    registerForContextMenu(getListView());
 
-    onSearchTextChange("");
+    // Prefs.
+    wordList = new File(prefs.getString(getString(R.string.wordListFileKey),
+        getString(R.string.wordListFileDefault)));
+    saveOnlyFirstSubentry = prefs.getBoolean(getString(R.string.saveOnlyFirstSubentryKey), false);
+    clickOpensContextMenu = prefs.getBoolean(getString(R.string.clickOpensContextMenuKey), false);
+    //if (prefs.getBoolean(getString(R.string.vibrateOnFailedSearchKey), true)) {
+      // vibrator = (Vibrator) getSystemService(Context.VIBRATOR_SERVICE);
+    //}
+    Log.d(LOG, "wordList=" + wordList + ", saveOnlyFirstSubentry=" + saveOnlyFirstSubentry);
+    
+    setDictionaryPrefs(this, dictFile, indexIndex, searchText.getText().toString());
   }
   
+  @Override
+  protected void onResume() {
+    super.onResume();
+    if (PreferenceActivity.prefsMightHaveChanged) {
+      PreferenceActivity.prefsMightHaveChanged = false;
+      finish();
+      startActivity(getIntent());
+    }
+    if (initialSearchText != null) {
+      setSearchText(initialSearchText, true);
+    }
+  }
   
   @Override
-  public void onStop() {
-    super.onStop();
-    closeCurrentDictionary();
+  protected void onPause() {
+    super.onPause();
+  }
+  
+  private static void setDictionaryPrefs(final Context context,
+      final File dictFile, final int indexIndex, final String searchToken) {
+    final SharedPreferences.Editor prefs = PreferenceManager.getDefaultSharedPreferences(context).edit();
+    prefs.putString(C.DICT_FILE, dictFile.getPath());
+    prefs.putInt(C.INDEX_INDEX, indexIndex);
+    prefs.putString(C.SEARCH_TOKEN, "");  // Don't need to save search token.
+    prefs.commit();
   }
 
-  private void closeCurrentDictionary() {
-    dictionary = null;
-    activeLangaugeData = null;
+  @Override
+  protected void onDestroy() {
+    super.onDestroy();
+    if (dictRaf == null) {
+      return;
+    }
+
+    final SearchOperation searchOperation = currentSearchOperation;
+    currentSearchOperation = null;
+
+    // Before we close the RAF, we have to wind the current search down.
+    if (searchOperation != null) {
+      Log.d(LOG, "Interrupting search to shut down.");
+      currentSearchOperation = null;
+      searchOperation.interrupted.set(true);
+    }
+    
     try {
-      if (dictRaf != null) {
-        dictRaf.close();
-      }
+      Log.d(LOG, "Closing RAF.");
+      dictRaf.close();
     } catch (IOException e) {
-      throw new RuntimeException(e);
+      Log.e(LOG, "Failed to close dictionary", e);
     }
     dictRaf = null;
   }
-  
-  public String getSelectedRowRawText() {
-    return activeLangaugeData.rowToString(activeLangaugeData.rows.get(selectedRowIndex));
+
+  // --------------------------------------------------------------------------
+  // Buttons
+  // --------------------------------------------------------------------------
+
+  private void onClearSearchTextButton(final Button clearSearchTextButton) {
+    setSearchText("", true);
+    Log.d(LOG, "Trying to show soft keyboard.");
+    final InputMethodManager manager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+    manager.showSoftInput(searchText, InputMethodManager.SHOW_IMPLICIT);
   }
   
-  public EditText getSearchText() {
-    return (EditText) findViewById(R.id.SearchText);
+  void updateLangButton() {
+//    final LanguageResources languageResources = Language.isoCodeToResources.get(index.shortName);
+//    if (languageResources != null && languageResources.flagId != 0) {
+//      langButton.setCompoundDrawablesWithIntrinsicBounds(0, 0, languageResources.flagId, 0);
+//    } else {
+//      langButton.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0);
+      langButton.setText(index.shortName);
+//    }
   }
-  
-  // ----------------------------------------------------------------
-  // OptionsMenu
-  // ----------------------------------------------------------------
 
-  private MenuItem switchLanguageMenuItem = null;
+  void onLanguageButton() {
+    if (currentSearchOperation != null) {
+      currentSearchOperation.interrupted.set(true);
+      currentSearchOperation = null;
+    }
+    changeIndexGetFocusAndResearch((indexIndex + 1)% dictionary.indices.size());
+  }
   
+  void onLanguageButtonLongClick(final Context context) {
+    final Dialog dialog = new Dialog(context);
+    dialog.setContentView(R.layout.select_dictionary_dialog);
+    dialog.setTitle(R.string.selectDictionary);
 
-  @Override
-  public boolean onCreateOptionsMenu(final Menu menu) {
-    switchLanguageMenuItem = menu.add("Switch to language.");
-    switchLanguageMenuItem.setOnMenuItemClickListener(new OnMenuItemClickListener(){
-      public boolean onMenuItemClick(final MenuItem menuItem) {
-        switchLanguage();
-        return false;
-      }});
+    final List<DictionaryInfo> installedDicts = ((DictionaryApplication)getApplication()).getUsableDicts();
+    
+    ListView listView = (ListView) dialog.findViewById(android.R.id.list);
 
-    final MenuItem preferences = menu.add("Preferences...");
-    preferences.setOnMenuItemClickListener(new OnMenuItemClickListener(){
-      public boolean onMenuItemClick(final MenuItem menuItem) {
-        startActivity(preferencesIntent);
-        return false;
-      }});
-
-    final MenuItem about = menu.add("About...");
-    about.setOnMenuItemClickListener(new OnMenuItemClickListener(){
-      public boolean onMenuItemClick(final MenuItem menuItem) {
-        final Intent intent = new Intent().setClassName(AboutActivity.class.getPackage().getName(), AboutActivity.class.getCanonicalName());
-        final StringBuilder currentDictInfo = new StringBuilder();
-        if (dictionary == null) {
-          currentDictInfo.append("No dictionary loaded.");
-        } else {
-          currentDictInfo.append(dictionary.dictionaryInfo).append("\n\n");
-          currentDictInfo.append("Entry count: " + dictionary.entries.size()).append("\n");
-          for (int i = 0; i < 2; ++i) {
-            final LanguageData languageData = dictionary.languageDatas[i]; 
-            currentDictInfo.append(languageData.language.symbol).append(":\n");
-            currentDictInfo.append("  Unique token count: " + languageData.sortedIndex.size()).append("\n");
-            currentDictInfo.append("  Row count: " + languageData.rows.size()).append("\n");
-          }
-        }
-        intent.putExtra(AboutActivity.CURRENT_DICT_INFO, currentDictInfo.toString());
-        startActivity(intent);
-        return false;
-      }});
+//    final LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+//    layoutParams.width = 0;
+//    layoutParams.weight = 1.0f;
 
-    final MenuItem download = menu.add("Download dictionary...");
-    download.setOnMenuItemClickListener(new OnMenuItemClickListener(){
-      public boolean onMenuItemClick(final MenuItem menuItem) {
-        startDownloadDictActivity();
-        return false;
-      }});
+    final Button button = new Button(listView.getContext());
+    final String name = getString(R.string.dictionaryManager);
+    button.setText(name);
+    final IntentLauncher intentLauncher = new IntentLauncher(listView.getContext(), DictionaryManagerActivity.getLaunchIntent()) {
+      @Override
+      protected void onGo() {
+        dialog.dismiss();
+        DictionaryActivity.this.finish();
+      };
+    };
+    button.setOnClickListener(intentLauncher);
+//    button.setLayoutParams(layoutParams);
+    listView.addHeaderView(button);
+//    listView.setHeaderDividersEnabled(true);
+    
+    listView.setAdapter(new BaseAdapter() {
+      @Override
+      public View getView(int position, View convertView, ViewGroup parent) {
+        final LinearLayout result = new LinearLayout(parent.getContext());
 
-    return true;
-  }
-  
-  @Override
-  public boolean onPrepareOptionsMenu(final Menu menu) {
-    if (dictionary != null) {
-      switchLanguageMenuItem.setTitle(String.format("Switch to %s", dictionary.languageDatas[Entry.otherLang(activeLangaugeData.lang)].language.symbol));
-    }
-    switchLanguageMenuItem.setEnabled(dictionary != null);
-    return super.onPrepareOptionsMenu(menu);
+        final DictionaryInfo dictionaryInfo = getItem(position);
+          final Button button = new Button(parent.getContext());
+          final String name = application.getDictionaryName(dictionaryInfo.uncompressedFilename);
+          button.setText(name);
+          final IntentLauncher intentLauncher = new IntentLauncher(parent.getContext(), getLaunchIntent(application.getPath(dictionaryInfo.uncompressedFilename), 0, searchText.getText().toString())) {
+            @Override
+            protected void onGo() {
+              dialog.dismiss();
+              DictionaryActivity.this.finish();
+            };
+          };
+          button.setOnClickListener(intentLauncher);
+          final LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+          layoutParams.width = 0;
+          layoutParams.weight = 1.0f;
+          button.setLayoutParams(layoutParams);
+          result.addView(button);
+        return result;
+      }
+      
+      @Override
+      public long getItemId(int position) {
+        return position;
+      }
+      
+      @Override
+      public DictionaryInfo getItem(int position) {
+        return installedDicts.get(position);
+      }
+      
+      @Override
+      public int getCount() {
+        return installedDicts.size();
+      }
+    });
+    
+    dialog.show();
   }
 
-  void switchLanguage() {
-    if (dictionary == null) {
-      return;
-    }
-    activeLangaugeData = dictionary.languageDatas[(activeLangaugeData == dictionary.languageDatas[0]) ? 1 : 0];
-    selectedRowIndex = 0;
-    selectedTokenRowIndex = 0;
+
+  private void changeIndexGetFocusAndResearch(final int newIndex) {
+    indexIndex = newIndex;
+    index = dictionary.indices.get(indexIndex);
+    indexAdapter = new IndexAdapter(index);
+    Log.d(LOG, "changingIndex, newLang=" + index.longName);
+    setListAdapter(indexAdapter);
     updateLangButton();
-    dictionaryListAdapter.notifyDataSetChanged();
-    onSearchTextChange(getSearchText().getText().toString());
+    searchText.requestFocus();  // Otherwise, nothing may happen.
+    onSearchTextChange(searchText.getText().toString());
+    setDictionaryPrefs(this, dictFile, indexIndex, searchText.getText().toString());
   }
   
-  void updateLangButton() {
-    final Button langButton = (Button) findViewById(R.id.LangButton);
-    langButton.setText(activeLangaugeData.language.symbol);
+  void onUpDownButton(final boolean up) {
+    if (isFiltered()) {
+      return;
+    }
+    final int firstVisibleRow = getListView().getFirstVisiblePosition();
+    final RowBase row = index.rows.get(firstVisibleRow);
+    final TokenRow tokenRow = row.getTokenRow(true);
+    final int destIndexEntry;
+    if (up) {
+      if (row != tokenRow) {
+        destIndexEntry = tokenRow.referenceIndex;
+      } else {
+        destIndexEntry = Math.max(tokenRow.referenceIndex - 1, 0);
+      }
+    } else {
+      // Down
+      destIndexEntry = Math.min(tokenRow.referenceIndex + 1, index.sortedIndexEntries.size());
+    }
+    final Index.IndexEntry dest = index.sortedIndexEntries.get(destIndexEntry);
+    Log.d(LOG, "onUpDownButton, destIndexEntry=" + dest.token);
+    searchText.removeTextChangedListener(searchTextWatcher);
+    searchText.setText(dest.token);
+    if (searchText.getLayout() != null) {
+      // Surprising, but this can otherwise crash sometimes...
+      Selection.moveToRightEdge(searchText.getText(), searchText.getLayout());
+    }
+    jumpToRow(index.sortedIndexEntries.get(destIndexEntry).startRow);
+    searchText.addTextChangedListener(searchTextWatcher);
   }
+
+  // --------------------------------------------------------------------------
+  // Options Menu
+  // --------------------------------------------------------------------------
   
-  // ----------------------------------------------------------------
-  // ContextMenu
-  // ----------------------------------------------------------------
+  final Random random = new Random();
   
+  @Override
+  public boolean onCreateOptionsMenu(final Menu menu) {
+    application.onCreateGlobalOptionsMenu(this, menu);
+
+    {
+      final MenuItem randomWord = menu.add(getString(R.string.randomWord));
+      randomWord.setOnMenuItemClickListener(new OnMenuItemClickListener() {
+        public boolean onMenuItemClick(final MenuItem menuItem) {
+          final String word = index.sortedIndexEntries.get(random.nextInt(index.sortedIndexEntries.size())).token;
+          setSearchText(word, true);
+          return false;
+        }
+      });
+    }
+    
+    {
+      final MenuItem dictionaryList = menu.add(getString(R.string.dictionaryManager));
+      dictionaryList.setOnMenuItemClickListener(new OnMenuItemClickListener() {
+        public boolean onMenuItemClick(final MenuItem menuItem) {
+          startActivity(DictionaryManagerActivity.getLaunchIntent());
+          finish();
+          return false;
+        }
+      });
+    }
+
+    {
+      final MenuItem aboutDictionary = menu.add(getString(R.string.aboutDictionary));
+      aboutDictionary.setOnMenuItemClickListener(new OnMenuItemClickListener() {
+        public boolean onMenuItemClick(final MenuItem menuItem) {
+          final Context context = getListView().getContext();
+          final Dialog dialog = new Dialog(context);
+          dialog.setContentView(R.layout.about_dictionary_dialog);
+          final TextView textView = (TextView) dialog.findViewById(R.id.text);
+
+          final String name = application.getDictionaryName(dictFile.getName());
+          dialog.setTitle(name);
+          
+          final StringBuilder builder = new StringBuilder();
+          final DictionaryInfo dictionaryInfo = dictionary.getDictionaryInfo();
+          dictionaryInfo.uncompressedBytes = dictFile.length();
+          if (dictionaryInfo != null) {
+            builder.append(dictionaryInfo.dictInfo).append("\n\n");
+            builder.append(getString(R.string.dictionaryPath, dictFile.getPath())).append("\n");
+            builder.append(getString(R.string.dictionarySize, dictionaryInfo.uncompressedBytes)).append("\n");
+            builder.append(getString(R.string.dictionaryCreationTime, dictionaryInfo.creationMillis)).append("\n");
+            for (final IndexInfo indexInfo : dictionaryInfo.indexInfos) {
+              builder.append("\n");
+              builder.append(getString(R.string.indexName, indexInfo.shortName)).append("\n");
+              builder.append(getString(R.string.mainTokenCount, indexInfo.mainTokenCount)).append("\n");
+            }
+            builder.append("\n");
+            builder.append(getString(R.string.sources)).append("\n");
+            for (final EntrySource source : dictionary.sources) {
+              builder.append(getString(R.string.sourceInfo, source.getName(), source.getNumEntries())).append("\n");
+            }
+          }
+//          } else {
+//            builder.append(getString(R.string.invalidDictionary));
+//          }
+          textView.setText(builder.toString());
+          
+          dialog.show();
+          final WindowManager.LayoutParams layoutParams = new WindowManager.LayoutParams();
+          layoutParams.width = WindowManager.LayoutParams.MATCH_PARENT;
+          layoutParams.height = WindowManager.LayoutParams.MATCH_PARENT;
+          dialog.getWindow().setAttributes(layoutParams);
+          return false;
+        }
+      });
+    }
+
+    return true;
+  }
+
+
+  // --------------------------------------------------------------------------
+  // Context Menu + clicks
+  // --------------------------------------------------------------------------
+
   @Override
   public void onCreateContextMenu(ContextMenu menu, View v,
       ContextMenuInfo menuInfo) {
-    if (selectedRowIndex == -1) {
-      return;
-    }
-    final MenuItem addToWordlist = menu.add("Add to wordlist: " + wordList.getName());
+    AdapterContextMenuInfo adapterContextMenuInfo = (AdapterContextMenuInfo) menuInfo;
+    final RowBase row = (RowBase) getListAdapter().getItem(adapterContextMenuInfo.position);
+
+    final MenuItem addToWordlist = menu.add(getString(R.string.addToWordList, wordList.getName()));
     addToWordlist.setOnMenuItemClickListener(new OnMenuItemClickListener() {
       public boolean onMenuItemClick(MenuItem item) {
-        final StringBuilder rawText = new StringBuilder();
-        final String word = activeLangaugeData.getIndexEntryForRow(selectedRowIndex).word;
-        rawText.append(new SimpleDateFormat("yyyy.MM.dd HH:mm:ss").format(new Date())).append("\t");
-        rawText.append(word).append("\t");
-        rawText.append(getSelectedRowRawText());
-        Log.d("THAD", "Writing : " + rawText);
-        try {
-          wordList.getParentFile().mkdirs();
-          final PrintWriter out = new PrintWriter(new FileWriter(wordList, true));
-          out.println(rawText.toString());
-          out.close();
-        } catch (IOException e) {
-          Log.e("THAD", "Unable to append to " + wordList.getAbsolutePath(), e);
-          final AlertDialog alert = new AlertDialog.Builder(DictionaryActivity.this).create();
-          alert.setMessage("Failed to append to file: " + wordList.getAbsolutePath());
-          alert.show();
-        }
+        onAppendToWordList(row);
         return false;
       }
     });
+
+    final MenuItem copy = menu.add(android.R.string.copy);
+    copy.setOnMenuItemClickListener(new OnMenuItemClickListener() {
+      public boolean onMenuItemClick(MenuItem item) {
+        onCopy(row);
+        return false;
+      }
+    });
+    
+    if (selectedSpannableText != null) {
+      final String selectedText = selectedSpannableText;
+      final MenuItem searchForSelection = menu.add(getString(R.string.searchForSelection, selectedSpannableText));
+      searchForSelection.setOnMenuItemClickListener(new OnMenuItemClickListener() {
+        public boolean onMenuItemClick(MenuItem item) {
+          int indexToUse = -1;
+          for (int i = 0; i < dictionary.indices.size(); ++i) {
+            final Index index = dictionary.indices.get(i);
+            if (indexPrepFinished) {
+              System.out.println("Doing index lookup: on " + selectedText);
+              final IndexEntry indexEntry = index.findExact(selectedText);
+              if (indexEntry != null) {
+                final TokenRow tokenRow = index.rows.get(indexEntry.startRow).getTokenRow(false);
+                if (tokenRow != null && tokenRow.hasMainEntry) {
+                  indexToUse = i;
+                  break;
+                }
+              }
+            } else {
+              Log.w(LOG, "Skipping findExact on index " + index.shortName);
+            }
+          }
+          if (indexToUse == -1) {
+            indexToUse = selectedSpannableIndex;
+          }
+          final boolean changeIndex = indexIndex != indexToUse;
+          setSearchText(selectedText, !changeIndex);  // If we're not changing index, we have to triggerSearch.
+          if (changeIndex) {
+            changeIndexGetFocusAndResearch(indexToUse);
+          }
+          // Give focus back to list view because typing is done.
+          getListView().requestFocus();
+          return false;
+        }
+      });
+    }
+    
+
   }
   
   @Override
-  public boolean onKeyDown(int keyCode, KeyEvent event) {
+  protected void onListItemClick(ListView l, View v, int row, long id) {
+    defocusSearchText();
+    if (clickOpensContextMenu && dictRaf != null) {
+      openContextMenu(v);
+    }
+  }
+  
+  void onAppendToWordList(final RowBase row) {
+    defocusSearchText();
+    
+    final StringBuilder rawText = new StringBuilder();
+    rawText.append(
+        new SimpleDateFormat("yyyy.MM.dd HH:mm:ss").format(new Date()))
+        .append("\t");
+    rawText.append(index.longName).append("\t");
+    rawText.append(row.getTokenRow(true).getToken()).append("\t");
+    rawText.append(row.getRawText(saveOnlyFirstSubentry));
+    Log.d(LOG, "Writing : " + rawText);
+
+    try {
+      wordList.getParentFile().mkdirs();
+      final PrintWriter out = new PrintWriter(
+          new FileWriter(wordList, true));
+      out.println(rawText.toString());
+      out.close();
+    } catch (IOException e) {
+      Log.e(LOG, "Unable to append to " + wordList.getAbsolutePath(), e);
+      Toast.makeText(this, getString(R.string.failedAddingToWordList, wordList.getAbsolutePath()), Toast.LENGTH_LONG).show();
+    }
+    return;
+  }
+  
+  /**
+   * Called when user clicks outside of search text, so that they can start
+   * typing again immediately.
+   */
+  void defocusSearchText() {
+    //Log.d(LOG, "defocusSearchText");
+    // Request focus so that if we start typing again, it clears the text input.
+    getListView().requestFocus();
+    
+    // Visual indication that a new keystroke will clear the search text.
+    searchText.selectAll();
+  }
+
+  @SuppressWarnings("deprecation")
+void onCopy(final RowBase row) {
+    defocusSearchText();
+
+    Log.d(LOG, "Copy, row=" + row);
+    final StringBuilder result = new StringBuilder();
+    result.append(row.getRawText(false));
+    final ClipboardManager clipboardManager = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE);
+    clipboardManager.setText(result.toString());
+    Log.d(LOG, "Copied: " + result);
+  }
+
+  @Override
+  public boolean onKeyDown(final int keyCode, final KeyEvent event) {
     if (event.getUnicodeChar() != 0) {
-      final EditText searchText = getSearchText();
       if (!searchText.hasFocus()) {
-        searchText.setText("" + (char)event.getUnicodeChar());
-        onSearchTextChange(searchText.getText().toString());
-        searchText.requestFocus();
+        setSearchText("" + (char) event.getUnicodeChar(), true);
       }
       return true;
     }
+    if (keyCode == KeyEvent.KEYCODE_BACK) {
+      //Log.d(LOG, "Clearing dictionary prefs.");
+      // Pretend that we just autolaunched so that we won't do it again.
+      //DictionaryManagerActivity.lastAutoLaunchMillis = System.currentTimeMillis();
+    }
+    if (keyCode == KeyEvent.KEYCODE_ENTER) {
+      Log.d(LOG, "Trying to hide soft keyboard.");
+      final InputMethodManager inputManager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+      inputManager.hideSoftInputFromWindow(this.getCurrentFocus().getWindowToken(), InputMethodManager.HIDE_NOT_ALWAYS);
+      return true;
+    }
     return super.onKeyDown(keyCode, event);
   }
 
-  @Override
-  protected void onListItemClick(ListView l, View v, int row, long id) {
-    selectedRowIndex = row;
-    Log.d("THAD", "Clicked: " + getSelectedRowRawText());
-    openContextMenu(getListView());
-  }
-
-  void onSearchTextChange(final String searchText) {
-    Log.d("THAD", "onSearchTextChange: " + searchText);
-    if (dictionary == null) {
-      return;
+  private void setSearchText(final String text, final boolean triggerSearch) {
+    if (!triggerSearch) {
+      getListView().requestFocus();
     }
-    if (searchOperation != null) {
-      searchOperation.interrupted.set(true);
+    searchText.setText(text);
+    searchText.requestFocus();
+    moveCursorToRight();
+    if (triggerSearch) {
+      onSearchTextChange(text);
     }
-    searchOperation = new SearchOperation(searchText);
-    searchExecutor.execute(searchOperation);
   }
   
-  private void jumpToRow(final int rowIndex) {
-    Log.d("THAD", "jumpToRow: " + rowIndex);
-    selectedRowIndex = rowIndex;
-    selectedTokenRowIndex = activeLangaugeData.getIndexEntryForRow(rowIndex).startRow;
-    getListView().setSelection(rowIndex);
-    getListView().setSelected(true);  // TODO: is this doing anything?
-    updateSearchText();
-  }
-
-  private void updateSearchText() {
-    final EditText searchText = getSearchText();
-    if (!searchText.hasFocus()) {
-      final String word = activeLangaugeData.getIndexEntryForRow(selectedRowIndex).word;
-      if (!word.equals(searchText.getText().toString())) {
-        Log.d("THAD", "updateSearchText: setText: " + word);
-        searchText.setText(word);
-      }
+  private long cursorDelayMillis = 100;
+  private void moveCursorToRight() {
+    if (searchText.getLayout() != null) {
+      cursorDelayMillis = 100;
+      // Surprising, but this can crash when you rotate...
+      Selection.moveToRightEdge(searchText.getText(), searchText.getLayout());
+    } else {
+      uiHandler.postDelayed(new Runnable() {
+        @Override
+        public void run() {
+          moveCursorToRight();
+        }
+      }, cursorDelayMillis);
+      cursorDelayMillis = Math.min(10 * 1000, 2 * cursorDelayMillis);
     }
   }
 
-  private void startDownloadDictActivity() {
-    final Intent intent = new Intent().setClassName(
-        DownloadActivity.class.getPackage().getName(),
-        DownloadActivity.class.getCanonicalName());
-    final SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(DictionaryActivity.this);
-    final String dictFetchUrl = settings.getString(DICT_FETCH_URL, getResources().getString(R.string.dictFetchUrl));
-    final String dictFileName = settings.getString(DICT_FILE, getResources().getString(R.string.dictFile));
-    intent.putExtra(DownloadActivity.SOURCE, dictFetchUrl);
-    intent.putExtra(DownloadActivity.DEST, dictFileName);
-    startActivity(intent);
+
+  // --------------------------------------------------------------------------
+  // SearchOperation
+  // --------------------------------------------------------------------------
+
+  private void searchFinished(final SearchOperation searchOperation) {
+    if (searchOperation.interrupted.get()) {
+      Log.d(LOG, "Search operation was interrupted: " + searchOperation);
+      return;
+    }
+    if (searchOperation != this.currentSearchOperation) {
+      Log.d(LOG, "Stale searchOperation finished: " + searchOperation);
+      return;
+    }
+    
+    final Index.IndexEntry searchResult = searchOperation.searchResult;
+    Log.d(LOG, "searchFinished: " + searchOperation + ", searchResult=" + searchResult);
+
+    currentSearchOperation = null;
+    uiHandler.postDelayed(new Runnable() {
+      @Override
+      public void run() {
+        if (currentSearchOperation == null) {
+          if (searchResult != null) {
+            if (isFiltered()) {
+              clearFiltered();
+            }
+            jumpToRow(searchResult.startRow);
+          } else if (searchOperation.multiWordSearchResult != null) {
+            // Multi-row search....
+            setFiltered(searchOperation);
+          } else {
+            throw new IllegalStateException("This should never happen.");
+          }
+        } else {
+          Log.d(LOG, "More coming, waiting for currentSearchOperation.");
+        }
+      }
+    }, 20);
+    
+  }
+  
+  private final void jumpToRow(final int row) {
+    setSelection(row);
+    getListView().setSelected(true);
   }
 
-  private final class SearchOperation implements Runnable {
-    final String searchText;
+  static final Pattern WHITESPACE = Pattern.compile("\\s+");
+  final class SearchOperation implements Runnable {
+    
     final AtomicBoolean interrupted = new AtomicBoolean(false);
+    final String searchText;
+    List<String> searchTokens;  // filled in for multiWord.
+    final Index index;
+    
+    long searchStartMillis;
 
-    public SearchOperation(final String searchText) {
-      this.searchText = searchText;
+    Index.IndexEntry searchResult;
+    List<RowBase> multiWordSearchResult;
+    
+    boolean done = false;
+    
+    SearchOperation(final String searchText, final Index index) {
+      this.searchText = searchText.trim();
+      this.index = index;
+    }
+    
+    public String toString() {
+      return String.format("SearchOperation(%s,%s)", searchText, interrupted.toString());
     }
 
+    @Override
     public void run() {
-      Log.d("THAD", "SearchOperation: " + searchText);
-      final int indexLocation = activeLangaugeData.lookup(searchText, interrupted);
-      if (interrupted.get()) {
-        return;
-      }
-      final IndexEntry indexEntry = activeLangaugeData.sortedIndex
-          .get(indexLocation);
-      uiHandler.post(new Runnable() {
-        public void run() {
-          jumpToRow(indexEntry.startRow);
+      try {
+        searchStartMillis = System.currentTimeMillis();
+        final String[] searchTokenArray = WHITESPACE.split(searchText);
+        if (searchTokenArray.length == 1) {
+          searchResult = index.findInsertionPoint(searchText, interrupted);
+        } else {
+          searchTokens = Arrays.asList(searchTokenArray);
+          multiWordSearchResult = index.multiWordSearch(searchTokens, interrupted);
         }
-      });
+        Log.d(LOG, "searchText=" + searchText + ", searchDuration="
+            + (System.currentTimeMillis() - searchStartMillis) + ", interrupted="
+            + interrupted.get());
+        if (!interrupted.get()) {
+          uiHandler.post(new Runnable() {
+            @Override
+            public void run() {            
+              searchFinished(SearchOperation.this);
+            }
+          });
+        }
+      } catch (Exception e) {
+        Log.e(LOG, "Failure during search (can happen during Activity close.");
+      } finally {
+        synchronized (this) {
+          done = true;
+          this.notifyAll();
+        }
+      }
     }
   }
 
-  private class DictionaryListAdapter extends BaseAdapter {
+  
+  // --------------------------------------------------------------------------
+  // IndexAdapter
+  // --------------------------------------------------------------------------
+  
+  static ViewGroup.LayoutParams WEIGHT_1 = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.MATCH_PARENT, 1.0f);
+  static ViewGroup.LayoutParams WEIGHT_0 = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.MATCH_PARENT, 0.0f);
+
+  final class IndexAdapter extends BaseAdapter {
+    
+    final Index index;
+    final List<RowBase> rows;
+    final Set<String> toHighlight;
+
+    IndexAdapter(final Index index) {
+      this.index = index;
+      rows = index.rows;
+      this.toHighlight = null;
+    }
+
+    IndexAdapter(final Index index, final List<RowBase> rows, final List<String> toHighlight) {
+      this.index = index;
+      this.rows = rows;
+      this.toHighlight = new LinkedHashSet<String>(toHighlight);
+    }
 
+    @Override
     public int getCount() {
-      return dictionary != null ? activeLangaugeData.rows.size() : 0;
+      return rows.size();
     }
 
-    public Dictionary.Row getItem(int rowIndex) {
-      assert rowIndex < activeLangaugeData.rows.size();
-      return activeLangaugeData.rows.get(rowIndex);
+    @Override
+    public RowBase getItem(int position) {
+      return rows.get(position);
     }
 
-    public long getItemId(int rowIndex) {
-      return rowIndex;
+    @Override
+    public long getItemId(int position) {
+      return getItem(position).index();
     }
 
-    public View getView(final int rowIndex, final View convertView,
-        final ViewGroup parent) {
-      final Row row = getItem(rowIndex);
-      
-      // Token row.
-      if (row.isToken()) {
-        TextView result = null;
-        if (convertView instanceof TextView) {
-          result = (TextView) convertView;
-        } else {
-          result = new TextView(parent.getContext());
-        }
-        result.setText(activeLangaugeData.rowToString(row));
-        result.setTextAppearance(parent.getContext(),
-            android.R.style.TextAppearance_Large);
-        result.setClickable(false);
-        return result;
+    @Override
+    public TableLayout getView(int position, View convertView, ViewGroup parent) {
+      final TableLayout result;
+      if (convertView instanceof TableLayout) {
+        result = (TableLayout) convertView;
+        result.removeAllViews();
+      } else {
+        result = new TableLayout(parent.getContext());
       }
+      final RowBase row = getItem(position);
+      if (row instanceof PairEntry.Row) {
+        return getView(position, (PairEntry.Row) row, parent, result);
+      } else if (row instanceof TokenRow) {
+        return getView((TokenRow) row, parent, result);
+      } else if (row instanceof HtmlEntry.Row) {
+        return getView((HtmlEntry.Row) row, parent, result);
+      } else {
+        throw new IllegalArgumentException("Unsupported Row type: " + row.getClass());
+      }
+    }
 
-      // Entry row(s).
-      final TableLayout result = new TableLayout(parent.getContext());
-
-      final Entry entry = dictionary.entries.get(row.getIndex());
-      final int rowCount = entry.getRowCount();
+    private TableLayout getView(final int position, PairEntry.Row row, ViewGroup parent, final TableLayout result) {
+      final PairEntry entry = row.getEntry();
+      final int rowCount = entry.pairs.size();
+      
+      final TableRow.LayoutParams layoutParams = new TableRow.LayoutParams();
+      layoutParams.weight = 0.5f;
+      
       for (int r = 0; r < rowCount; ++r) {
         final TableRow tableRow = new TableRow(result.getContext());
-        
-        TextView column1 = new TextView(tableRow.getContext());
-        TextView column2 = new TextView(tableRow.getContext());
-        final TableRow.LayoutParams layoutParams = new TableRow.LayoutParams();
-        layoutParams.weight = 0.5f;
-        
-        if (r>0){
-          final TextView spacer = new TextView(tableRow.getContext());
-          spacer.setText(r == 0 ? "\95 " : " \95 ");
-          tableRow.addView(spacer);
+
+        final TextView col1 = new TextView(tableRow.getContext());
+        final TextView col2 = new TextView(tableRow.getContext());
+
+        // Set the columns in the table.
+        if (r > 0) {
+          final TextView bullet = new TextView(tableRow.getContext());
+          bullet.setText(" • ");
+          tableRow.addView(bullet);
         }
-        tableRow.addView(column1, layoutParams);
+        tableRow.addView(col1, layoutParams);
+        final TextView margin = new TextView(tableRow.getContext());
+        margin.setText(" ");
+        tableRow.addView(margin);
         if (r > 0) {
-          final TextView spacer = new TextView(tableRow.getContext());
-          spacer.setText(r == 0 ? "\95 " : " \95 ");
-          tableRow.addView(spacer);
+          final TextView bullet = new TextView(tableRow.getContext());
+          bullet.setText(" • ");
+          tableRow.addView(bullet);
         }
-        tableRow.addView(column2, layoutParams);
+        tableRow.addView(col2, layoutParams);
+        col1.setWidth(1);
+        col2.setWidth(1);
+        
+        // Set what's in the columns.
+
+        final Pair pair = entry.pairs.get(r);
+        final String col1Text = index.swapPairEntries ? pair.lang2 : pair.lang1;
+        final String col2Text = index.swapPairEntries ? pair.lang1 : pair.lang2;
         
-        column1.setWidth(1);
-        column2.setWidth(1);
-        // column1.setTextAppearance(parent.getContext(), android.R.style.Text);
+        col1.setText(col1Text, TextView.BufferType.SPANNABLE);
+        col2.setText(col2Text, TextView.BufferType.SPANNABLE);
         
-        // TODO: color words by gender
-        final String col1Text = entry.getAllText(activeLangaugeData.lang)[r]; 
-        column1.setText(col1Text, TextView.BufferType.SPANNABLE);
-        final Spannable col1Spannable = (Spannable) column1.getText();
-        int startPos = 0;
-        final String token = activeLangaugeData.getIndexEntryForRow(rowIndex).word;
-        while ((startPos = col1Text.indexOf(token, startPos)) != -1) {
-          col1Spannable.setSpan(new StyleSpan(Typeface.BOLD), startPos, startPos + token.length(), Spannable.SPAN_INCLUSIVE_EXCLUSIVE);
-         startPos += token.length();
+        // Bold the token instances in col1.
+        final Set<String> toBold = toHighlight != null ? this.toHighlight : Collections.singleton(row.getTokenRow(true).getToken());
+        final Spannable col1Spannable = (Spannable) col1.getText();
+        for (final String token : toBold) {
+          int startPos = 0;
+          while ((startPos = col1Text.indexOf(token, startPos)) != -1) {
+            col1Spannable.setSpan(new StyleSpan(Typeface.BOLD), startPos,
+                startPos + token.length(), Spannable.SPAN_INCLUSIVE_EXCLUSIVE);
+            startPos += token.length();
+          }
         }
         
-        column2.setText(entry.getAllText(Entry.otherLang(activeLangaugeData.lang))[r], TextView.BufferType.NORMAL);
+        createTokenLinkSpans(col1, col1Spannable, col1Text);
+        createTokenLinkSpans(col2, (Spannable) col2.getText(), col2Text);
+        
+        col1.setTypeface(typeface);
+        col2.setTypeface(typeface);
+        col1.setTextSize(TypedValue.COMPLEX_UNIT_SP, fontSizeSp);
+        col2.setTextSize(TypedValue.COMPLEX_UNIT_SP, fontSizeSp);
+        // col2.setBackgroundResource(theme.otherLangBg);
+        
+        if (index.swapPairEntries) {
+          col2.setOnLongClickListener(textViewLongClickListenerIndex0);
+          col1.setOnLongClickListener(textViewLongClickListenerIndex1);
+        } else {
+          col1.setOnLongClickListener(textViewLongClickListenerIndex0);
+          col2.setOnLongClickListener(textViewLongClickListenerIndex1);
+        }
         
         result.addView(tableRow);
       }
+
+      // Because we have a Button inside a ListView row:
+      // http://groups.google.com/group/android-developers/browse_thread/thread/3d96af1530a7d62a?pli=1
+      result.setDescendantFocusability(ViewGroup.FOCUS_BLOCK_DESCENDANTS);
+      result.setClickable(true);
+      result.setFocusable(true);
+      result.setLongClickable(true);
+      result.setBackgroundResource(android.R.drawable.menuitem_background);
+      result.setOnClickListener(new TextView.OnClickListener() {
+        @Override
+        public void onClick(View v) {
+          DictionaryActivity.this.onListItemClick(getListView(), v, position, position);
+        }
+      });
+
+      return result;
+    }
+    
+
+    private TableLayout getView(HtmlEntry.Row row, ViewGroup parent, final TableLayout result) {
+      final Context context = parent.getContext();
+      
+      final HtmlEntry htmlEntry = row.getEntry();
+      
+      //final TableRow tableRow = new TableRow(context);
+      final LinearLayout tableRow = new LinearLayout(context);
+      result.addView(tableRow);
+      
+      // Text.
+      final TextView textView = new TextView(context);
+      textView.setText(htmlEntry.title);
+      textView.setLayoutParams(new LinearLayout.LayoutParams(0, ViewGroup.LayoutParams.WRAP_CONTENT, 1.0f));
+      tableRow.addView(textView);
+      
+      // Button.
+      final Button button = new Button(context);
+      button.setText("open");
+      button.setLayoutParams(new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT, 0.0f));
+      tableRow.addView(button);
+      
+      button.setOnClickListener(new OnClickListener() {
+        @Override
+        public void onClick(View v) {
+          startActivity(HtmlDisplayActivity.getHtmlIntent(String.format("<html><head></head><body>%s</body></html>", htmlEntry.html)));
+        }
+      });
+      
+      return result;
+    }
+    
+    private TableLayout getView(TokenRow row, ViewGroup parent, final TableLayout result) {
+      final Context context = parent.getContext();
+      final TextView textView = new TextView(context);
+      textView.setText(row.getToken());
+      // Doesn't work:
+      //textView.setTextColor(android.R.color.secondary_text_light);
+      textView.setTextAppearance(context, theme.tokenRowFg);
+      textView.setTypeface(typeface);
+      textView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 5 * fontSizeSp / 4);
       
+      final TableRow tableRow = new TableRow(result.getContext());
+      tableRow.addView(textView);
+      tableRow.setBackgroundResource(row.hasMainEntry ? theme.tokenRowMainBg : theme.tokenRowOtherBg);
+      result.addView(tableRow);
       return result;
     }
-  }  // DictionaryListAdapter
+    
+  }
+
+  static final Pattern CHAR_DASH = Pattern.compile("['\\p{L}\\p{M}\\p{N}]+");
+
+  private void createTokenLinkSpans(final TextView textView, final Spannable spannable, final String text) {
+    // Saw from the source code that LinkMovementMethod sets the selection!
+    // http://grepcode.com/file/repository.grepcode.com/java/ext/com.google.android/android/2.3.1_r1/android/text/method/LinkMovementMethod.java#LinkMovementMethod
+    textView.setMovementMethod(LinkMovementMethod.getInstance());
+    final Matcher matcher = CHAR_DASH.matcher(text);
+    while (matcher.find()) {
+      spannable.setSpan(new NonLinkClickableSpan(), matcher.start(), matcher.end(), Spannable.SPAN_INCLUSIVE_EXCLUSIVE);
+    }
+  }
+  
 
-  private class DictionaryTextWatcher implements TextWatcher {
-    public void afterTextChanged(final Editable searchText) {
-      if (getSearchText().hasFocus()) {
+  String selectedSpannableText = null;
+  int selectedSpannableIndex = -1;
+
+  @Override
+  public boolean onTouchEvent(MotionEvent event) {
+    selectedSpannableText = null;
+    selectedSpannableIndex = -1;
+    return super.onTouchEvent(event);
+  }
+
+  private class TextViewLongClickListener implements OnLongClickListener {
+    final int index;
+    
+    private TextViewLongClickListener(final int index) {
+      this.index = index;
+    }
+
+    @Override
+    public boolean onLongClick(final View v) {
+      final TextView textView = (TextView) v;
+      final int start = textView.getSelectionStart();
+      final int end = textView.getSelectionEnd();
+      if (start >= 0 &&  end >= 0) {
+        selectedSpannableText = textView.getText().subSequence(start, end).toString();
+        selectedSpannableIndex = index;
+      }
+      return false;
+    }
+  }
+  final TextViewLongClickListener textViewLongClickListenerIndex0 = new TextViewLongClickListener(0);
+  final TextViewLongClickListener textViewLongClickListenerIndex1 = new TextViewLongClickListener(1);
+  
+
+  // --------------------------------------------------------------------------
+  // SearchText
+  // --------------------------------------------------------------------------
+
+  void onSearchTextChange(final String text) {
+    if ("thadolina".equals(text)) {
+      final Dialog dialog = new Dialog(getListView().getContext());
+      dialog.setContentView(R.layout.thadolina_dialog);
+      dialog.setTitle("Ti amo, amore mio!");
+      final ImageView imageView = (ImageView) dialog.findViewById(R.id.thadolina_image);
+      imageView.setOnClickListener(new OnClickListener() {
+        @Override
+        public void onClick(View v) {
+          final Intent intent = new Intent(Intent.ACTION_VIEW);
+          intent.setData(Uri.parse("https://sites.google.com/site/cfoxroxvday/vday2012"));
+          startActivity(intent);
+        }
+      });
+      dialog.show();
+    }
+    if (dictRaf == null) {
+      Log.d(LOG, "searchText changed during shutdown, doing nothing.");
+      return;
+    }
+    if (!searchText.isFocused()) {
+      Log.d(LOG, "searchText changed without focus, doing nothing.");
+      return;
+    }
+    Log.d(LOG, "onSearchTextChange: " + text);    
+    if (currentSearchOperation != null) {
+      Log.d(LOG, "Interrupting currentSearchOperation.");
+      currentSearchOperation.interrupted.set(true);
+    }
+    currentSearchOperation = new SearchOperation(text, index);
+    searchExecutor.execute(currentSearchOperation);
+  }
+  
+  private class SearchTextWatcher implements TextWatcher {
+    public void afterTextChanged(final Editable searchTextEditable) {
+      if (searchText.hasFocus()) {
+        Log.d(LOG, "Search text changed with focus: " + searchText.getText());
         // If they were typing to cause the change, update the UI.
-        onSearchTextChange(searchText.toString());
+        onSearchTextChange(searchText.getText().toString());
       }
     }
 
@@ -532,5 +1229,27 @@ public class DictionaryActivity extends ListActivity {
     public void onTextChanged(CharSequence arg0, int arg1, int arg2, int arg3) {
     }
   }
-  
-}
\ No newline at end of file
+
+  // --------------------------------------------------------------------------
+  // Filtered results.
+  // --------------------------------------------------------------------------
+
+  boolean isFiltered() {
+    return rowsToShow != null;
+  }
+
+  void setFiltered(final SearchOperation searchOperation) {
+    ((Button) findViewById(R.id.UpButton)).setEnabled(false);
+    ((Button) findViewById(R.id.DownButton)).setEnabled(false);
+    rowsToShow = searchOperation.multiWordSearchResult;
+    setListAdapter(new IndexAdapter(index, rowsToShow, searchOperation.searchTokens));
+  }
+
+  void clearFiltered() {
+    ((Button) findViewById(R.id.UpButton)).setEnabled(true);
+    ((Button) findViewById(R.id.DownButton)).setEnabled(true);
+    setListAdapter(new IndexAdapter(index));
+    rowsToShow = null;
+  }
+
+}