X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;f=src%2Fcom%2Fhughes%2Fandroid%2Fdictionary%2FDictionaryActivity.java;h=d2b4a923623fa4534151baca54ce25655b220604;hb=e3a434becb9cc5e8bfa912a5241b66b6a24b65d1;hp=6720aa4e965192d9b17e7cb78a220ea0db6b0220;hpb=fe76c2cc9f6aa3fdda2716bf378813bd2d694e99;p=Dictionary.git

diff --git a/src/com/hughes/android/dictionary/DictionaryActivity.java b/src/com/hughes/android/dictionary/DictionaryActivity.java
index 6720aa4..d2b4a92 100644
--- a/src/com/hughes/android/dictionary/DictionaryActivity.java
+++ b/src/com/hughes/android/dictionary/DictionaryActivity.java
@@ -20,6 +20,7 @@ import android.app.SearchManager;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.content.pm.PackageManager;
 import android.graphics.Color;
 import android.graphics.Typeface;
 import android.net.Uri;
@@ -28,12 +29,15 @@ import android.os.Handler;
 import android.preference.PreferenceManager;
 import android.speech.tts.TextToSpeech;
 import android.speech.tts.TextToSpeech.OnInitListener;
+import android.support.design.widget.FloatingActionButton;
 import android.support.v4.view.MenuItemCompat;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.ActionBarActivity;
 import android.support.v7.widget.SearchView;
 import android.support.v7.widget.SearchView.OnQueryTextListener;
+import android.support.v7.widget.Toolbar;
 import android.text.ClipboardManager;
+import android.text.InputType;
 import android.text.Spannable;
 import android.text.method.LinkMovementMethod;
 import android.text.style.ClickableSpan;
@@ -105,6 +109,7 @@ import java.util.Locale;
 import java.util.Random;
 import java.util.Set;
 import java.util.concurrent.Executor;
+import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -128,9 +133,11 @@ public class DictionaryActivity extends ActionBarActivity {
 
     List<RowBase> rowsToShow = null; // if not null, just show these rows.
 
+    final Random rand = new Random();
+
     final Handler uiHandler = new Handler();
 
-    private final Executor searchExecutor = Executors.newSingleThreadExecutor(new ThreadFactory() {
+    private final ExecutorService searchExecutor = Executors.newSingleThreadExecutor(new ThreadFactory() {
         @Override
         public Thread newThread(Runnable r) {
             return new Thread(r, "searchExecutor");
@@ -167,7 +174,7 @@ public class DictionaryActivity extends ActionBarActivity {
     ImageButton languageButton;
     SearchView.OnQueryTextListener onQueryTextListener;
 
-    MenuItem nextWordMenuItem, previousWordMenuItem;
+    MenuItem nextWordMenuItem, previousWordMenuItem, randomWordMenuItem;
 
     // Never null.
     private File wordList = null;
@@ -188,11 +195,12 @@ public class DictionaryActivity extends ActionBarActivity {
     }
 
     public static Intent getLaunchIntent(Context c, final File dictFile, final String indexShortName,
-            final String searchToken) {
+                                         final String searchToken) {
         final Intent intent = new Intent(c, DictionaryActivity.class);
         intent.putExtra(C.DICT_FILE, dictFile.getPath());
         intent.putExtra(C.INDEX_SHORT_NAME, indexShortName);
         intent.putExtra(C.SEARCH_TOKEN, searchToken);
+        intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK);
         return intent;
     }
 
@@ -204,6 +212,17 @@ public class DictionaryActivity extends ActionBarActivity {
         outState.putString(C.SEARCH_TOKEN, searchView.getQuery().toString());
     }
 
+    private int getMatchLen(String search, Index.IndexEntry e) {
+        if (e == null) return 0;
+        for (int i = 0; i < search.length(); ++i) {
+            String a = search.substring(0, i + 1);
+            String b = e.token.substring(0, i + 1);
+            if (!a.equalsIgnoreCase(b))
+                return i;
+        }
+        return search.length();
+    }
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         // This needs to be before super.onCreate, otherwise ActionbarSherlock
@@ -234,8 +253,7 @@ public class DictionaryActivity extends ActionBarActivity {
          *         -> language in which the phrase is written to -> to which
          *         language shall be translated
          */
-        if (intentAction != null && intentAction.equals("com.hughes.action.ACTION_SEARCH_DICT"))
-        {
+        if (intentAction != null && intentAction.equals("com.hughes.action.ACTION_SEARCH_DICT")) {
             String query = intent.getStringExtra(SearchManager.QUERY);
             String from = intent.getStringExtra("from");
             if (from != null)
@@ -243,42 +261,35 @@ public class DictionaryActivity extends ActionBarActivity {
             String to = intent.getStringExtra("to");
             if (to != null)
                 to = to.toLowerCase(Locale.US);
-            if (query != null)
-            {
+            if (query != null) {
                 getIntent().putExtra(C.SEARCH_TOKEN, query);
             }
-            if (intent.getStringExtra(C.DICT_FILE) == null && (from != null || to != null))
-            {
+            if (intent.getStringExtra(C.DICT_FILE) == null && (from != null || to != null)) {
                 Log.d(LOG, "DictSearch: from: " + from + " to " + to);
                 List<DictionaryInfo> dicts = application.getDictionariesOnDevice(null);
-                for (DictionaryInfo info : dicts)
-                {
+                for (DictionaryInfo info : dicts) {
                     boolean hasFrom = from == null;
                     boolean hasTo = to == null;
-                    for (IndexInfo index : info.indexInfos)
-                    {
+                    for (IndexInfo index : info.indexInfos) {
                         if (!hasFrom && index.shortName.toLowerCase(Locale.US).equals(from))
                             hasFrom = true;
                         if (!hasTo && index.shortName.toLowerCase(Locale.US).equals(to))
                             hasTo = true;
                     }
-                    if (hasFrom && hasTo)
-                    {
-                        if (from != null)
-                        {
+                    if (hasFrom && hasTo) {
+                        if (from != null) {
                             int which_index = 0;
-                            for (; which_index < info.indexInfos.size(); ++which_index)
-                            {
+                            for (; which_index < info.indexInfos.size(); ++which_index) {
                                 if (info.indexInfos.get(which_index).shortName.toLowerCase(
-                                        Locale.US).equals(from))
+                                            Locale.US).equals(from))
                                     break;
                             }
                             intent.putExtra(C.INDEX_SHORT_NAME,
-                                    info.indexInfos.get(which_index).shortName);
+                                            info.indexInfos.get(which_index).shortName);
 
                         }
                         intent.putExtra(C.DICT_FILE, application.getPath(info.uncompressedFilename)
-                                .toString());
+                                        .toString());
                         break;
                     }
                 }
@@ -290,28 +301,75 @@ public class DictionaryActivity extends ActionBarActivity {
          *         simple query Arguments follow from android standard (see
          *         documentation)
          */
-        if (intentAction != null && intentAction.equals(Intent.ACTION_SEARCH))
-        {
+        if (intentAction != null && intentAction.equals(Intent.ACTION_SEARCH)) {
             String query = intent.getStringExtra(SearchManager.QUERY);
             if (query != null)
                 getIntent().putExtra(C.SEARCH_TOKEN, query);
         }
+        if (intentAction != null && intentAction.equals(Intent.ACTION_SEND)) {
+            String query = intent.getStringExtra(Intent.EXTRA_TEXT);
+            if (query != null)
+                getIntent().putExtra(C.SEARCH_TOKEN, query);
+        }
+        /*
+         * This processes text on M+ devices where QuickDic shows up in the context menu.
+         */
+        if (intentAction != null && intentAction.equals(Intent.ACTION_PROCESS_TEXT)) {
+            String query = intent.getStringExtra(Intent.EXTRA_PROCESS_TEXT);
+            if (query != null) {
+                getIntent().putExtra(C.SEARCH_TOKEN, query);
+            }
+        }
         /**
          * @author Dominik Köppl If no dictionary is chosen, use the default
          *         dictionary specified in the preferences If this step does
-         *         fail (no default directory specified), show a toast and
+         *         fail (no default dictionary specified), show a toast and
          *         abort.
          */
-        if (intent.getStringExtra(C.DICT_FILE) == null)
-        {
+        if (intent.getStringExtra(C.DICT_FILE) == null) {
             String dictfile = prefs.getString(getString(R.string.defaultDicKey), null);
             if (dictfile != null)
                 intent.putExtra(C.DICT_FILE, application.getPath(dictfile).toString());
         }
         String dictFilename = intent.getStringExtra(C.DICT_FILE);
+        if (dictFilename == null && intent.getStringExtra(C.SEARCH_TOKEN) != null) {
+            final List<DictionaryInfo> dics = application.getDictionariesOnDevice(null);
+            final String search = intent.getStringExtra(C.SEARCH_TOKEN);
+            String bestFname = null;
+            String bestIndex = null;
+            int bestMatchLen = 2; // ignore shorter matches
+            AtomicBoolean dummy = new AtomicBoolean();
+            for (int i = 0; dictFilename == null && i < dics.size(); ++i) {
+                try {
+                    Log.d(LOG, "Checking dictionary " + dics.get(i).uncompressedFilename);
+                    final File dictfile = application.getPath(dics.get(i).uncompressedFilename);
+                    Dictionary dic = new Dictionary(new RandomAccessFile(dictfile, "r"));
+                    for (int j = 0; j < dic.indices.size(); ++j) {
+                        Index idx = dic.indices.get(j);
+                        Log.d(LOG, "Checking index " + idx.shortName);
+                        if (idx.findExact(search) != null) {
+                            Log.d(LOG, "Found exact match");
+                            dictFilename = dictfile.toString();
+                            intent.putExtra(C.INDEX_SHORT_NAME, idx.shortName);
+                            break;
+                        }
+                        int matchLen = getMatchLen(search, idx.findInsertionPoint(search, dummy));
+                        Log.d(LOG, "Found partial match length " + matchLen);
+                        if (matchLen > bestMatchLen) {
+                            bestFname = dictfile.toString();
+                            bestIndex = idx.shortName;
+                            bestMatchLen = matchLen;
+                        }
+                    }
+                } catch (Exception e) {}
+            }
+            if (dictFilename == null && bestFname != null) {
+                dictFilename = bestFname;
+                intent.putExtra(C.INDEX_SHORT_NAME, bestIndex);
+            }
+        }
 
-        if (dictFilename == null)
-        {
+        if (dictFilename == null) {
             Toast.makeText(this, getString(R.string.no_dict_file), Toast.LENGTH_LONG).show();
             startActivity(DictionaryManagerActivity.getLaunchIntent(getApplicationContext()));
             finish();
@@ -325,7 +383,7 @@ public class DictionaryActivity extends ActionBarActivity {
             @Override
             public void onInit(int status) {
                 ttsReady = true;
-                updateTTSLanguage();
+                updateTTSLanguage(indexIndex);
             }
         });
 
@@ -345,7 +403,7 @@ public class DictionaryActivity extends ActionBarActivity {
                 dictRaf = null;
             }
             Toast.makeText(this, getString(R.string.invalidDictionary, "", e.getMessage()),
-                    Toast.LENGTH_LONG).show();
+                           Toast.LENGTH_LONG).show();
             startActivity(DictionaryManagerActivity.getLaunchIntent(getApplicationContext()));
             finish();
             return;
@@ -363,11 +421,13 @@ public class DictionaryActivity extends ActionBarActivity {
         }
         Log.d(LOG, "Loading index " + indexIndex);
         index = dictionary.indices.get(indexIndex);
+        getListView().setEmptyView(findViewById(android.R.id.empty));
         setListAdapter(new IndexAdapter(index));
 
         // Pre-load the collators.
         new Thread(new Runnable() {
             public void run() {
+                android.os.Process.setThreadPriority(android.os.Process.THREAD_PRIORITY_BACKGROUND);
                 final long startMillis = System.currentTimeMillis();
                 try {
                     TransliteratorManager.init(new TransliteratorManager.Callback() {
@@ -385,14 +445,14 @@ public class DictionaryActivity extends ActionBarActivity {
                     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);
+                        if (entry == null || !searchToken.equals(entry.token)) {
+                            Log.e(LOG, "Couldn't find token: " + searchToken + ", " + (entry == null ? "null" : entry.token));
                         }
                     }
                     indexPrepFinished = true;
                 } catch (Exception e) {
                     Log.w(LOG,
-                            "Exception while prepping.  This can happen if dictionary is closed while search is happening.");
+                          "Exception while prepping.  This can happen if dictionary is closed while search is happening.");
                 }
                 Log.d(LOG, "Prepping indices took:" + (System.currentTimeMillis() - startMillis));
             }
@@ -401,11 +461,11 @@ public class DictionaryActivity extends ActionBarActivity {
         String fontName = prefs.getString(getString(R.string.fontKey), "FreeSerif.otf.jpg");
         if ("SYSTEM".equals(fontName)) {
             typeface = Typeface.DEFAULT;
-	} else if ("SERIF".equals(fontName)) {
+        } else if ("SERIF".equals(fontName)) {
             typeface = Typeface.SERIF;
-	} else if ("SANS_SERIF".equals(fontName)) {
+        } else if ("SANS_SERIF".equals(fontName)) {
             typeface = Typeface.SANS_SERIF;
-	} else if ("MONOSPACE".equals(fontName)) {
+        } else if ("MONOSPACE".equals(fontName)) {
             typeface = Typeface.MONOSPACE;
         } else {
             if ("FreeSerif.ttf.jpg".equals(fontName)) {
@@ -416,7 +476,7 @@ public class DictionaryActivity extends ActionBarActivity {
             } 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();
+                               Toast.LENGTH_LONG).show();
             }
         }
         if (typeface == null) {
@@ -436,13 +496,22 @@ public class DictionaryActivity extends ActionBarActivity {
         // Cache some prefs.
         wordList = application.getWordListFile();
         saveOnlyFirstSubentry = prefs.getBoolean(getString(R.string.saveOnlyFirstSubentryKey),
-                false);
+                                false);
         clickOpensContextMenu = prefs.getBoolean(getString(R.string.clickOpensContextMenuKey),
-                false);
+                                !getPackageManager().hasSystemFeature(PackageManager.FEATURE_TOUCHSCREEN));
         Log.d(LOG, "wordList=" + wordList + ", saveOnlyFirstSubentry=" + saveOnlyFirstSubentry);
 
         onCreateSetupActionBarAndSearchView();
 
+        View floatSwapButton = findViewById(R.id.floatSwapButton);
+        floatSwapButton.setOnLongClickListener(new OnLongClickListener() {
+            @Override
+            public boolean onLongClick(View v) {
+                onLanguageButtonLongClick(v.getContext());
+                return true;
+            }
+        });
+
         // Set the search text from the intent, then the saved state.
         String text = getIntent().getStringExtra(C.SEARCH_TOKEN);
         if (savedInstanceState != null) {
@@ -468,13 +537,11 @@ public class DictionaryActivity extends ActionBarActivity {
         actionBar.setDisplayShowTitleEnabled(false);
         actionBar.setDisplayShowHomeEnabled(false);
         actionBar.setDisplayHomeAsUpEnabled(false);
-        
+
         final LinearLayout customSearchView = new LinearLayout(getSupportActionBar().getThemedContext());
-        
-        final int width = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 300,
-                getResources().getDisplayMetrics());
+
         final LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(
-                ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+            ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
         customSearchView.setLayoutParams(layoutParams);
 
         listView.setOnItemClickListener(new OnItemClickListener() {
@@ -485,46 +552,40 @@ public class DictionaryActivity extends ActionBarActivity {
         });
 
         languageButton = new ImageButton(customSearchView.getContext());
-        languageButton.setMinimumWidth(application.languageButtonPixels);
-        languageButton.setMinimumHeight(application.languageButtonPixels * 2 / 3);
+        languageButton.setId(R.id.languageButton);
         languageButton.setScaleType(ScaleType.FIT_CENTER);
         languageButton.setOnClickListener(new OnClickListener() {
             @Override
-            public void onClick(View arg0) {
-                onLanguageButtonClick();
-            }
-        });
-        languageButton.setOnLongClickListener(new OnLongClickListener() {
-            @Override
-            public boolean onLongClick(View v) {
+            public void onClick(View v) {
                 onLanguageButtonLongClick(v.getContext());
-                return true;
             }
         });
-        customSearchView.addView(languageButton);
+        languageButton.setAdjustViewBounds(true);
+        LinearLayout.LayoutParams lpb = new LinearLayout.LayoutParams(application.languageButtonPixels, LinearLayout.LayoutParams.MATCH_PARENT);
+        customSearchView.addView(languageButton, lpb);
 
         searchView = new SearchView(getSupportActionBar().getThemedContext());
-        searchView.setIconifiedByDefault(false);
-        // searchView.setIconified(false); // puts the magnifying glass in the
-        // wrong place.
+        searchView.setId(R.id.searchView);
+
+        // Get rid of search icon, it takes up too much space.
+        // There is still text saying "search" in the search field.
+        searchView.setIconifiedByDefault(true);
+        searchView.setIconified(false);
+
         searchView.setQueryHint(getString(R.string.searchText));
         searchView.setSubmitButtonEnabled(false);
-        LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams(0,
-                FrameLayout.LayoutParams.WRAP_CONTENT);
-        lp.weight = 1;
-        searchView.setLayoutParams(lp);
+        searchView.setInputType(InputType.TYPE_CLASS_TEXT);
         searchView.setImeOptions(
-                EditorInfo.IME_ACTION_SEARCH |
-                        EditorInfo.IME_FLAG_NO_EXTRACT_UI |
-                        EditorInfo.IME_FLAG_NO_ENTER_ACTION |
-                        // EditorInfo.IME_FLAG_NO_FULLSCREEN | // Requires API
-                        // 11
-                        EditorInfo.IME_MASK_ACTION |
-                        EditorInfo.TYPE_TEXT_FLAG_NO_SUGGESTIONS);
+            EditorInfo.IME_ACTION_DONE |
+            EditorInfo.IME_FLAG_NO_EXTRACT_UI |
+            // EditorInfo.IME_FLAG_NO_FULLSCREEN | // Requires API
+            // 11
+            EditorInfo.TYPE_TEXT_FLAG_NO_SUGGESTIONS);
         onQueryTextListener = new OnQueryTextListener() {
             @Override
             public boolean onQueryTextSubmit(String query) {
                 Log.d(LOG, "OnQueryTextListener: onQueryTextSubmit: " + searchView.getQuery());
+                hideKeyboard();
                 return true;
             }
 
@@ -537,10 +598,20 @@ public class DictionaryActivity extends ActionBarActivity {
         };
         searchView.setOnQueryTextListener(onQueryTextListener);
         searchView.setFocusable(true);
-        customSearchView.addView(searchView);
+        LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams(0,
+                FrameLayout.LayoutParams.WRAP_CONTENT, 1);
+        customSearchView.addView(searchView, lp);
 
         actionBar.setCustomView(customSearchView);
         actionBar.setDisplayShowCustomEnabled(true);
+
+        // Avoid wasting space on large left inset
+        Toolbar tb = (Toolbar)customSearchView.getParent();
+        tb.setContentInsetsRelative(0, 0);
+
+        getListView().setNextFocusLeftId(R.id.searchView);
+        findViewById(R.id.floatSwapButton).setNextFocusRightId(R.id.languageButton);
+        languageButton.setNextFocusLeftId(R.id.floatSwapButton);
     }
 
     @Override
@@ -574,7 +645,7 @@ public class DictionaryActivity extends ActionBarActivity {
     }
 
     private static void setDictionaryPrefs(final Context context, final File dictFile,
-            final String indexShortName, final String searchToken) {
+                                           final String indexShortName, final String searchToken) {
         final SharedPreferences.Editor prefs = PreferenceManager.getDefaultSharedPreferences(
                 context).edit();
         prefs.putString(C.DICT_FILE, dictFile.getPath());
@@ -599,6 +670,9 @@ public class DictionaryActivity extends ActionBarActivity {
             currentSearchOperation = null;
             searchOperation.interrupted.set(true);
         }
+        searchExecutor.shutdownNow();
+        textToSpeech.shutdown();
+        textToSpeech = null;
 
         try {
             Log.d(LOG, "Closing RAF.");
@@ -634,9 +708,16 @@ public class DictionaryActivity extends ActionBarActivity {
         }
     }
 
+    private void hideKeyboard() {
+        Log.d(LOG, "Hide soft keyboard.");
+        searchView.clearFocus();
+        InputMethodManager manager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+        manager.hideSoftInputFromWindow(searchView.getWindowToken(), 0);
+    }
+
     void updateLangButton() {
         final LanguageResources languageResources =
-                DictionaryApplication.isoCodeToResources.get(index.shortName);
+            DictionaryApplication.isoCodeToResources.get(index.shortName);
         if (languageResources != null && languageResources.flagId != 0) {
             languageButton.setImageResource(languageResources.flagId);
         } else {
@@ -646,24 +727,39 @@ public class DictionaryActivity extends ActionBarActivity {
                 languageButton.setImageResource(android.R.drawable.ic_media_previous);
             }
         }
-        updateTTSLanguage();
+        updateTTSLanguage(indexIndex);
     }
 
-    private void updateTTSLanguage() {
+    private void updateTTSLanguage(int i) {
         if (!ttsReady || index == null || textToSpeech == null) {
             Log.d(LOG, "Can't updateTTSLanguage.");
             return;
         }
-        final Locale locale = new Locale(index.sortLanguage.getIsoCode());
+        final Locale locale = new Locale(dictionary.indices.get(i).sortLanguage.getIsoCode());
         Log.d(LOG, "Setting TTS locale to: " + locale);
-        final int ttsResult = textToSpeech.setLanguage(locale);
-        if (ttsResult != TextToSpeech.LANG_AVAILABLE ||
-                ttsResult != TextToSpeech.LANG_COUNTRY_AVAILABLE) {
-            Log.e(LOG, "TTS not available in this language: ttsResult=" + ttsResult);
+        try {
+            final int ttsResult = textToSpeech.setLanguage(locale);
+            if (ttsResult != TextToSpeech.LANG_AVAILABLE &&
+                    ttsResult != TextToSpeech.LANG_COUNTRY_AVAILABLE) {
+                Log.e(LOG, "TTS not available in this language: ttsResult=" + ttsResult);
+            }
+        } catch (Exception e) {
+            Toast.makeText(this, getString(R.string.TTSbroken), Toast.LENGTH_LONG).show();
+        }
+    }
+
+    public void onSearchButtonClick(View dummy) {
+        if (!searchView.hasFocus()) {
+            searchView.requestFocus();
         }
+        if (searchView.getQuery().toString().length() > 0) {
+            searchView.setQuery("", false);
+        }
+        showKeyboard();
+        searchView.setIconified(false);
     }
 
-    void onLanguageButtonClick() {
+    public void onLanguageButtonClick(View dummy) {
         if (dictionary.indices.size() == 1) {
             // No need to work to switch indices.
             return;
@@ -673,7 +769,7 @@ public class DictionaryActivity extends ActionBarActivity {
             currentSearchOperation = null;
         }
         setIndexAndSearchText((indexIndex + 1) % dictionary.indices.size(),
-                searchView.getQuery().toString());
+                              searchView.getQuery().toString(), false);
     }
 
     void onLanguageButtonLongClick(final Context context) {
@@ -688,7 +784,7 @@ public class DictionaryActivity extends ActionBarActivity {
         final String name = getString(R.string.dictionaryManager);
         button.setText(name);
         final IntentLauncher intentLauncher = new IntentLauncher(listView.getContext(),
-                DictionaryManagerActivity.getLaunchIntent(getApplicationContext())) {
+        DictionaryManagerActivity.getLaunchIntent(getApplicationContext())) {
             @Override
             protected void onGo() {
                 dialog.dismiss();
@@ -698,6 +794,7 @@ public class DictionaryActivity extends ActionBarActivity {
         button.setOnClickListener(intentLauncher);
         listView.addHeaderView(button);
 
+        listView.setItemsCanFocus(true);
         listView.setAdapter(new BaseAdapter() {
             @Override
             public View getView(int position, View convertView, ViewGroup parent) {
@@ -708,11 +805,11 @@ public class DictionaryActivity extends ActionBarActivity {
                 for (int i = 0; i < dictionaryInfo.indexInfos.size(); ++i) {
                     final IndexInfo indexInfo = dictionaryInfo.indexInfos.get(i);
                     final View button = application.createButton(parent.getContext(),
-                            dictionaryInfo, indexInfo);
+                                        dictionaryInfo, indexInfo);
                     final IntentLauncher intentLauncher = new IntentLauncher(parent.getContext(),
                             getLaunchIntent(getApplicationContext(),
-                                    application.getPath(dictionaryInfo.uncompressedFilename),
-                                    indexInfo.shortName, searchView.getQuery().toString())) {
+                                            application.getPath(dictionaryInfo.uncompressedFilename),
+                    indexInfo.shortName, searchView.getQuery().toString())) {
                         @Override
                         protected void onGo() {
                             dialog.dismiss();
@@ -720,15 +817,19 @@ public class DictionaryActivity extends ActionBarActivity {
                         }
                     };
                     button.setOnClickListener(intentLauncher);
+                    if (i == indexIndex && dictFile != null &&
+                            dictFile.getName().equals(dictionaryInfo.uncompressedFilename)) {
+                        button.setPressed(true);
+                    }
                     result.addView(button);
                 }
 
                 final TextView nameView = new TextView(parent.getContext());
                 final String name = application
-                        .getDictionaryName(dictionaryInfo.uncompressedFilename);
+                                    .getDictionaryName(dictionaryInfo.uncompressedFilename);
                 nameView.setText(name);
                 final LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(
-                        ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+                    ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
                 layoutParams.width = 0;
                 layoutParams.weight = 1.0f;
                 nameView.setLayoutParams(layoutParams);
@@ -771,7 +872,7 @@ public class DictionaryActivity extends ActionBarActivity {
             }
         } else {
             // Down
-            destIndexEntry = Math.min(tokenRow.referenceIndex + 1, index.sortedIndexEntries.size());
+            destIndexEntry = Math.min(tokenRow.referenceIndex + 1, index.sortedIndexEntries.size() - 1);
         }
         final Index.IndexEntry dest = index.sortedIndexEntries.get(destIndexEntry);
         Log.d(LOG, "onUpDownButton, destIndexEntry=" + dest.token);
@@ -780,6 +881,14 @@ public class DictionaryActivity extends ActionBarActivity {
         defocusSearchText();
     }
 
+    void onRandomWordButton() {
+        int destIndexEntry = rand.nextInt(index.sortedIndexEntries.size());
+        final Index.IndexEntry dest = index.sortedIndexEntries.get(destIndexEntry);
+        setSearchText(dest.token, false);
+        jumpToRow(index.sortedIndexEntries.get(destIndexEntry).startRow);
+        defocusSearchText();
+    }
+
     // --------------------------------------------------------------------------
     // Options Menu
     // --------------------------------------------------------------------------
@@ -793,7 +902,7 @@ public class DictionaryActivity extends ActionBarActivity {
                 .getBoolean(getString(R.string.showPrevNextButtonsKey), true)) {
             // Next word.
             nextWordMenuItem = menu.add(getString(R.string.nextWord))
-                    .setIcon(R.drawable.arrow_down_float);
+                               .setIcon(R.drawable.arrow_down_float);
             MenuItemCompat.setShowAsAction(nextWordMenuItem, MenuItem.SHOW_AS_ACTION_IF_ROOM);
             nextWordMenuItem.setOnMenuItemClickListener(new OnMenuItemClickListener() {
                 @Override
@@ -805,7 +914,7 @@ public class DictionaryActivity extends ActionBarActivity {
 
             // Previous word.
             previousWordMenuItem = menu.add(getString(R.string.previousWord))
-                    .setIcon(R.drawable.arrow_up_float);
+                                   .setIcon(R.drawable.arrow_up_float);
             MenuItemCompat.setShowAsAction(previousWordMenuItem, MenuItem.SHOW_AS_ACTION_IF_ROOM);
             previousWordMenuItem.setOnMenuItemClickListener(new OnMenuItemClickListener() {
                 @Override
@@ -816,6 +925,15 @@ public class DictionaryActivity extends ActionBarActivity {
             });
         }
 
+        randomWordMenuItem = menu.add(getString(R.string.randomWord));
+        randomWordMenuItem.setOnMenuItemClickListener(new OnMenuItemClickListener() {
+            @Override
+            public boolean onMenuItemClick(MenuItem item) {
+                onRandomWordButton();
+                return true;
+            }
+        });
+
         application.onCreateGlobalOptionsMenu(this, menu);
 
         {
@@ -849,27 +967,27 @@ public class DictionaryActivity extends ActionBarActivity {
                     if (dictionaryInfo != null) {
                         builder.append(dictionaryInfo.dictInfo).append("\n\n");
                         builder.append(getString(R.string.dictionaryPath, dictFile.getPath()))
-                                .append("\n");
+                        .append("\n");
                         builder.append(
-                                getString(R.string.dictionarySize, dictionaryInfo.uncompressedBytes))
-                                .append("\n");
+                            getString(R.string.dictionarySize, dictionaryInfo.uncompressedBytes))
+                        .append("\n");
                         builder.append(
-                                getString(R.string.dictionaryCreationTime,
-                                        dictionaryInfo.creationMillis)).append("\n");
+                            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");
+                            .append("\n");
                             builder.append(
-                                    getString(R.string.mainTokenCount, indexInfo.mainTokenCount))
-                                    .append("\n");
+                                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");
+                                getString(R.string.sourceInfo, source.getName(),
+                                          source.getNumEntries())).append("\n");
                         }
                     }
                     textView.setText(builder.toString());
@@ -899,12 +1017,12 @@ public class DictionaryActivity extends ActionBarActivity {
         final android.view.MenuItem addToWordlist = menu.add(getString(R.string.addToWordList,
                 wordList.getName()));
         addToWordlist
-                .setOnMenuItemClickListener(new android.view.MenuItem.OnMenuItemClickListener() {
-                    public boolean onMenuItemClick(android.view.MenuItem item) {
-                        onAppendToWordList(row);
-                        return false;
-                    }
-                });
+        .setOnMenuItemClickListener(new android.view.MenuItem.OnMenuItemClickListener() {
+            public boolean onMenuItemClick(android.view.MenuItem item) {
+                onAppendToWordList(row);
+                return false;
+            }
+        });
 
         final android.view.MenuItem share = menu.add("Share");
         share.setOnMenuItemClickListener(new android.view.MenuItem.OnMenuItemClickListener() {
@@ -912,9 +1030,9 @@ public class DictionaryActivity extends ActionBarActivity {
                 Intent shareIntent = new Intent(android.content.Intent.ACTION_SEND);
                 shareIntent.setType("text/plain");
                 shareIntent.putExtra(android.content.Intent.EXTRA_SUBJECT, row.getTokenRow(true)
-                        .getToken());
+                                     .getToken());
                 shareIntent.putExtra(android.content.Intent.EXTRA_TEXT,
-                        row.getRawText(saveOnlyFirstSubentry));
+                                     row.getRawText(saveOnlyFirstSubentry));
                 startActivity(shareIntent);
                 return false;
             }
@@ -931,26 +1049,28 @@ public class DictionaryActivity extends ActionBarActivity {
         if (selectedSpannableText != null) {
             final String selectedText = selectedSpannableText;
             final android.view.MenuItem searchForSelection = menu.add(getString(
-                    R.string.searchForSelection,
-                    selectedSpannableText));
+                        R.string.searchForSelection,
+                        selectedSpannableText));
             searchForSelection
-                    .setOnMenuItemClickListener(new android.view.MenuItem.OnMenuItemClickListener() {
-                        public boolean onMenuItemClick(android.view.MenuItem item) {
-                            jumpToTextFromHyperLink(selectedText, selectedSpannableIndex);
-                            return false;
-                        }
-                    });
+            .setOnMenuItemClickListener(new android.view.MenuItem.OnMenuItemClickListener() {
+                public boolean onMenuItemClick(android.view.MenuItem item) {
+                    jumpToTextFromHyperLink(selectedText, selectedSpannableIndex);
+                    return false;
+                }
+            });
             // Rats, this won't be shown:
             //searchForSelection.setIcon(R.drawable.abs__ic_search);
         }
 
-        if (row instanceof TokenRow && ttsReady) {
+        if ((row instanceof TokenRow || selectedSpannableText != null) && ttsReady) {
             final android.view.MenuItem speak = menu.add(R.string.speak);
+            final String textToSpeak = row instanceof TokenRow ? ((TokenRow) row).getToken() : selectedSpannableText;
+            updateTTSLanguage(row instanceof TokenRow ? indexIndex : selectedSpannableIndex);
             speak.setOnMenuItemClickListener(new android.view.MenuItem.OnMenuItemClickListener() {
                 @Override
                 public boolean onMenuItemClick(android.view.MenuItem item) {
-                    textToSpeech.speak(((TokenRow) row).getToken(), TextToSpeech.QUEUE_FLUSH,
-                            new HashMap<String, String>());
+                    textToSpeech.speak(textToSpeak, TextToSpeech.QUEUE_FLUSH,
+                                       new HashMap<String, String>());
                     return false;
                 }
             });
@@ -958,8 +1078,9 @@ public class DictionaryActivity extends ActionBarActivity {
     }
 
     private void jumpToTextFromHyperLink(
-            final String selectedText, final int defaultIndexToUse) {
+        final String selectedText, final int defaultIndexToUse) {
         int indexToUse = -1;
+        int numFound = 0;
         for (int i = 0; i < dictionary.indices.size(); ++i) {
             final Index index = dictionary.indices.get(i);
             if (indexPrepFinished) {
@@ -967,17 +1088,17 @@ public class DictionaryActivity extends ActionBarActivity {
                 final IndexEntry indexEntry = index.findExact(selectedText);
                 if (indexEntry != null) {
                     final TokenRow tokenRow = index.rows.get(indexEntry.startRow)
-                            .getTokenRow(false);
+                                              .getTokenRow(false);
                     if (tokenRow != null && tokenRow.hasMainEntry) {
                         indexToUse = i;
-                        break;
+                        ++numFound;
                     }
                 }
             } else {
                 Log.w(LOG, "Skipping findExact on index " + index.shortName);
             }
         }
-        if (indexToUse == -1) {
+        if (numFound != 1 || indexToUse == -1) {
             indexToUse = defaultIndexToUse;
         }
         // Without this extra delay, the call to jumpToRow that this
@@ -986,7 +1107,7 @@ public class DictionaryActivity extends ActionBarActivity {
         getListView().postDelayed(new Runnable() {
             @Override
             public void run() {
-                setIndexAndSearchText(actualIndexToUse, selectedText);
+                setIndexAndSearchText(actualIndexToUse, selectedText, true);
             }
         }, 100);
     }
@@ -1002,7 +1123,7 @@ public class DictionaryActivity extends ActionBarActivity {
         getListView().requestFocus();
 
         // Visual indication that a new keystroke will clear the search text.
-        // Doesn't seem to work unless earchText has focus.
+        // Doesn't seem to work unless searchText has focus.
         // searchView.selectAll();
     }
 
@@ -1032,8 +1153,8 @@ public class DictionaryActivity extends ActionBarActivity {
         } catch (Exception e) {
             Log.e(LOG, "Unable to append to " + wordList.getAbsolutePath(), e);
             Toast.makeText(this,
-                    getString(R.string.failedAddingToWordList, wordList.getAbsolutePath()),
-                    Toast.LENGTH_LONG).show();
+                           getString(R.string.failedAddingToWordList, wordList.getAbsolutePath()),
+                           Toast.LENGTH_LONG).show();
         }
         return;
     }
@@ -1068,14 +1189,17 @@ public class DictionaryActivity extends ActionBarActivity {
         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);
+            View focus = getCurrentFocus();
+            if (focus != null) {
+                inputManager.hideSoftInputFromWindow(focus.getWindowToken(),
+                                                     InputMethodManager.HIDE_NOT_ALWAYS);
+            }
             return true;
         }
         return super.onKeyDown(keyCode, event);
     }
 
-    private void setIndexAndSearchText(int newIndex, String newSearchText) {
+    private void setIndexAndSearchText(int newIndex, String newSearchText, boolean hideKeyboard) {
         Log.d(LOG, "Changing index to: " + newIndex);
         if (newIndex == -1) {
             Log.e(LOG, "Invalid index.");
@@ -1090,21 +1214,31 @@ public class DictionaryActivity extends ActionBarActivity {
             setDictionaryPrefs(this, dictFile, index.shortName, searchView.getQuery().toString());
             updateLangButton();
         }
-        setSearchText(newSearchText, true);
+        setSearchText(newSearchText, true, hideKeyboard);
     }
 
-    private void setSearchText(final String text, final boolean triggerSearch) {
+    private void setSearchText(final String text, final boolean triggerSearch, boolean hideKeyboard) {
         Log.d(LOG, "setSearchText, text=" + text + ", triggerSearch=" + triggerSearch);
         // Disable the listener, because sometimes it doesn't work.
         searchView.setOnQueryTextListener(null);
         searchView.setQuery(text, false);
         moveCursorToRight();
         searchView.setOnQueryTextListener(onQueryTextListener);
+
         if (triggerSearch) {
-            onQueryTextListener.onQueryTextChange(text);
+            onSearchTextChange(text);
+        }
+
+        // We don't want to show virtual keyboard when we're changing searchView text programatically:
+        if (hideKeyboard) {
+            hideKeyboard();
         }
     }
 
+    private void setSearchText(final String text, final boolean triggerSearch) {
+        setSearchText(text, triggerSearch, true);
+    }
+
     // private long cursorDelayMillis = 100;
     private void moveCursorToRight() {
         // if (searchText.getLayout() != null) {
@@ -1209,12 +1343,12 @@ public class DictionaryActivity extends ActionBarActivity {
                 } else {
                     searchTokens = Arrays.asList(searchTokenArray);
                     multiWordSearchResult = index.multiWordSearch(searchText, searchTokens,
-                            interrupted);
+                                            interrupted);
                 }
                 Log.d(LOG,
-                        "searchText=" + searchText + ", searchDuration="
-                                + (System.currentTimeMillis() - searchStartMillis)
-                                + ", interrupted=" + interrupted.get());
+                      "searchText=" + searchText + ", searchDuration="
+                      + (System.currentTimeMillis() - searchStartMillis)
+                      + ", interrupted=" + interrupted.get());
                 if (!interrupted.get()) {
                     uiHandler.post(new Runnable() {
                         @Override
@@ -1241,10 +1375,10 @@ public class DictionaryActivity extends ActionBarActivity {
     // --------------------------------------------------------------------------
 
     static ViewGroup.LayoutParams WEIGHT_1 = new LinearLayout.LayoutParams(
-            ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.MATCH_PARENT, 1.0f);
+        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);
+        ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.MATCH_PARENT, 0.0f);
 
     final class IndexAdapter extends BaseAdapter {
 
@@ -1321,7 +1455,7 @@ public class DictionaryActivity extends ActionBarActivity {
         }
 
         private TableLayout getView(final int position, PairEntry.Row row, ViewGroup parent,
-                final TableLayout result) {
+                                    final TableLayout result) {
             final PairEntry entry = row.getEntry();
             final int rowCount = entry.pairs.size();
 
@@ -1334,6 +1468,10 @@ public class DictionaryActivity extends ActionBarActivity {
 
                 final TextView col1 = new TextView(tableRow.getContext());
                 final TextView col2 = new TextView(tableRow.getContext());
+                if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.HONEYCOMB) {
+                    col1.setTextIsSelectable(true);
+                    col2.setTextIsSelectable(true);
+                }
 
                 // Set the columns in the table.
                 if (r > 0) {
@@ -1365,13 +1503,13 @@ public class DictionaryActivity extends ActionBarActivity {
 
                 // Bold the token instances in col1.
                 final Set<String> toBold = toHighlight != null ? this.toHighlight : Collections
-                        .singleton(row.getTokenRow(true).getToken());
+                                           .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);
+                                              + token.length(), Spannable.SPAN_INCLUSIVE_EXCLUSIVE);
                         startPos += token.length();
                     }
                 }
@@ -1403,7 +1541,7 @@ public class DictionaryActivity extends ActionBarActivity {
             result.setFocusable(true);
             result.setLongClickable(true);
 //            result.setBackgroundResource(android.R.drawable.menuitem_background);
-            
+
             result.setBackgroundResource(theme.normalRowBg);
 
             result.setOnClickListener(new TextView.OnClickListener() {
@@ -1423,7 +1561,7 @@ public class DictionaryActivity extends ActionBarActivity {
 
             final TableRow tableRow = new TableRow(result.getContext());
             tableRow.setBackgroundResource(hasMainEntry ? theme.tokenRowMainBg
-                    : theme.tokenRowOtherBg);
+                                           : theme.tokenRowOtherBg);
             if (isTokenRow) {
                 tableRow.setPadding(mPaddingDefault, mPaddingDefault, mPaddingDefault, 0);
             } else {
@@ -1435,9 +1573,7 @@ public class DictionaryActivity extends ActionBarActivity {
             final TextView textView = new TextView(context);
             textView.setText(text, BufferType.SPANNABLE);
             createTokenLinkSpans(textView, (Spannable) textView.getText(), text);
-            final TextViewLongClickListener textViewLongClickListenerIndex0 = new TextViewLongClickListener(
-                    0);
-            textView.setOnLongClickListener(textViewLongClickListenerIndex0);
+            textView.setOnLongClickListener(indexIndex > 0 ? textViewLongClickListenerIndex1 : textViewLongClickListenerIndex0);
             result.setLongClickable(true);
 
             // Doesn't work:
@@ -1472,10 +1608,10 @@ public class DictionaryActivity extends ActionBarActivity {
                         String html = HtmlEntry.htmlBody(htmlEntries, index.shortName);
                         // Log.d(LOG, "html=" + html);
                         startActivityForResult(
-                                HtmlDisplayActivity.getHtmlIntent(getApplicationContext(), String.format(
-                                        "<html><head></head><body>%s</body></html>", html),
-                                        htmlTextToHighlight, false),
-                                0);
+                            HtmlDisplayActivity.getHtmlIntent(getApplicationContext(), String.format(
+                                    "<html><head></head><body>%s</body></html>", html),
+                                                              htmlTextToHighlight, false),
+                            0);
                     }
                 });
             }
@@ -1485,16 +1621,16 @@ public class DictionaryActivity extends ActionBarActivity {
         private TableLayout getView(TokenRow row, ViewGroup parent, final TableLayout result) {
             final IndexEntry indexEntry = row.getIndexEntry();
             return getPossibleLinkToHtmlEntryView(true, indexEntry.token, row.hasMainEntry,
-                    indexEntry.htmlEntries, null, parent, result);
+                                                  indexEntry.htmlEntries, null, parent, result);
         }
 
         private TableLayout getView(HtmlEntry.Row row, ViewGroup parent, final TableLayout result) {
             final HtmlEntry htmlEntry = row.getEntry();
             final TokenRow tokenRow = row.getTokenRow(true);
             return getPossibleLinkToHtmlEntryView(false,
-                    getString(R.string.seeAlso, htmlEntry.title, htmlEntry.entrySource.getName()),
-                    false, Collections.singletonList(htmlEntry), tokenRow.getToken(), parent,
-                    result);
+                                                  getString(R.string.seeAlso, htmlEntry.title, htmlEntry.entrySource.getName()),
+                                                  false, Collections.singletonList(htmlEntry), tokenRow.getToken(), parent,
+                                                  result);
         }
 
     }
@@ -1502,15 +1638,15 @@ public class DictionaryActivity extends ActionBarActivity {
     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) {
+                                      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(textColorFg), matcher.start(),
-                    matcher.end(),
-                    Spannable.SPAN_INCLUSIVE_EXCLUSIVE);
+                              matcher.end(),
+                              Spannable.SPAN_INCLUSIVE_EXCLUSIVE);
         }
     }
 
@@ -1546,10 +1682,10 @@ public class DictionaryActivity extends ActionBarActivity {
     }
 
     final TextViewLongClickListener textViewLongClickListenerIndex0 = new TextViewLongClickListener(
-            0);
+        0);
 
     final TextViewLongClickListener textViewLongClickListenerIndex1 = new TextViewLongClickListener(
-            1);
+        1);
 
     // --------------------------------------------------------------------------
     // SearchText
@@ -1576,10 +1712,6 @@ public class DictionaryActivity extends ActionBarActivity {
             return;
         }
 
-        // Hide search icon once text is entered
-        searchView.setIconifiedByDefault(text.length() > 0);
-        searchView.setIconified(false);
-
         // if (!searchView.hasFocus()) {
         // Log.d(LOG, "searchText changed without focus, doing nothing.");
         // return;
@@ -1591,6 +1723,7 @@ public class DictionaryActivity extends ActionBarActivity {
         }
         currentSearchOperation = new SearchOperation(text, index);
         searchExecutor.execute(currentSearchOperation);
+        ((FloatingActionButton)findViewById(R.id.floatSearchButton)).setImageResource(text.length() > 0 ? R.drawable.ic_clear_black_24dp : R.drawable.ic_search_black_24dp);
     }
 
     // --------------------------------------------------------------------------