Always hide search icon.

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

diff --git a/src/com/hughes/android/dictionary/DictionaryActivity.java b/src/com/hughes/android/dictionary/DictionaryActivity.java
index 67c1d834003bef2a626e24e840d45069f822f149..6f7eeb02843fff0daa5f68b10739be1284711358 100644 (file)
--- a/src/com/hughes/android/dictionary/DictionaryActivity.java
+++ b/src/com/hughes/android/dictionary/DictionaryActivity.java
@@ -507,9 +507,12 @@ public class DictionaryActivity extends ActionBarActivity {
         customSearchView.addView(languageButton, lpb);
 
         searchView = new SearchView(getSupportActionBar().getThemedContext());
-        searchView.setIconifiedByDefault(false);
-        // searchView.setIconified(false); // puts the magnifying glass in the
-        // wrong place.
+
+        // 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);
         searchView.setInputType(InputType.TYPE_CLASS_TEXT);
@@ -689,7 +692,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) {
@@ -1026,7 +1029,7 @@ public class DictionaryActivity extends ActionBarActivity {
         getListView().postDelayed(new Runnable() {
             @Override
             public void run() {
-                setIndexAndSearchText(actualIndexToUse, selectedText);
+                setIndexAndSearchText(actualIndexToUse, selectedText, true);
             }
         }, 100);
     }
@@ -1118,7 +1121,7 @@ public class DictionaryActivity extends ActionBarActivity {
         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.");
@@ -1133,10 +1136,10 @@ 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);
@@ -1144,16 +1147,18 @@ public class DictionaryActivity extends ActionBarActivity {
         moveCursorToRight();
         searchView.setOnQueryTextListener(onQueryTextListener);
 
-        // Hide search icon once text is entered
-        searchView.setIconifiedByDefault(text.length() > 0);
-        searchView.setIconified(false);
-
         if (triggerSearch) {
             onSearchTextChange(text);
         }
 
         // We don't want to show virtual keyboard when we're changing searchView text programatically:
-        hideKeyboard();
+        if (hideKeyboard) {
+            hideKeyboard();
+        }
+    }
+
+    private void setSearchText(final String text, final boolean triggerSearch) {
+       setSearchText(text, triggerSearch, true);
     }
 
     // private long cursorDelayMillis = 100;
@@ -1625,10 +1630,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;