Improved looks for the flags.

[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 966b5b65d38c54cde3bb48b3b0e25792751854ac..bd45672730ce08c79e90f0ac083c3f2e1218e574 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;
@@ -486,8 +487,6 @@ public class DictionaryActivity extends ActionBarActivity {
         });
 
         languageButton = new ImageButton(customSearchView.getContext());
-        languageButton.setMinimumWidth(application.languageButtonPixels);
-        languageButton.setMinimumHeight(application.languageButtonPixels * 2 / 3);
         languageButton.setScaleType(ScaleType.FIT_CENTER);
         languageButton.setOnClickListener(new OnClickListener() {
             @Override
@@ -502,7 +501,9 @@ public class DictionaryActivity extends ActionBarActivity {
                 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);
@@ -540,6 +541,10 @@ public class DictionaryActivity extends ActionBarActivity {
 
         actionBar.setCustomView(customSearchView);
         actionBar.setDisplayShowCustomEnabled(true);
+
+       // Avoid wasting space on large left inset
+        Toolbar tb = (Toolbar)customSearchView.getParent();
+        tb.setContentInsetsRelative(0, 0);
     }
 
     @Override