Avoid wasted space in ActionBar.

[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 db7e8aa7fae78e860628bba64108572d4f33557e..7cd6db4483f22195268027cd840933af1fbb5805 100644 (file)
--- a/src/com/hughes/android/dictionary/DictionaryActivity.java
+++ b/src/com/hughes/android/dictionary/DictionaryActivity.java
@@ -33,6 +33,7 @@ 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.Spannable;
 import android.text.method.LinkMovementMethod;
@@ -368,6 +369,7 @@ public class DictionaryActivity extends ActionBarActivity {
         // 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() {
@@ -509,10 +511,6 @@ public class DictionaryActivity extends ActionBarActivity {
         // wrong place.
         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.setImeOptions(
                 EditorInfo.IME_ACTION_SEARCH |
                         EditorInfo.IME_FLAG_NO_EXTRACT_UI |
@@ -537,10 +535,16 @@ 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);
     }
 
     @Override
@@ -1100,6 +1104,11 @@ public class DictionaryActivity extends ActionBarActivity {
         searchView.setQuery(text, false);
         moveCursorToRight();
         searchView.setOnQueryTextListener(onQueryTextListener);
+
+        // Hide search icon once text is entered
+        searchView.setIconifiedByDefault(text.length() > 0);
+        searchView.setIconified(false);
+
         if (triggerSearch) {
             onQueryTextListener.onQueryTextChange(text);
         }
@@ -1575,6 +1584,11 @@ public class DictionaryActivity extends ActionBarActivity {
             Log.d(LOG, "searchText changed during shutdown, doing nothing.");
             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;