X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;f=src%2Fcom%2Fhughes%2Fandroid%2Fdictionary%2FDictionaryActivity.java;h=0a1ea9a9dc842400fe69767a1cbc6d4aff77df3b;hb=9cdff5211c0ebb939eb622999be3a8b97ae4fbf8;hp=5d0c9c6c34e1ea30204b14491e84ec181cea1567;hpb=3223d85888517adfdf1a3a4652c0c7fcf8fabff2;p=Dictionary.git

diff --git a/src/com/hughes/android/dictionary/DictionaryActivity.java b/src/com/hughes/android/dictionary/DictionaryActivity.java
index 5d0c9c6..0a1ea9a 100644
--- a/src/com/hughes/android/dictionary/DictionaryActivity.java
+++ b/src/com/hughes/android/dictionary/DictionaryActivity.java
@@ -22,6 +22,7 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.graphics.Color;
 import android.graphics.Typeface;
+import android.graphics.drawable.ColorDrawable;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
@@ -37,12 +38,14 @@ import android.util.Log;
 import android.util.TypedValue;
 import android.view.ContextMenu;
 import android.view.ContextMenu.ContextMenuInfo;
+import android.view.Gravity;
 import android.view.KeyEvent;
 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.ViewGroup.LayoutParams;
 import android.view.WindowManager;
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodManager;
@@ -51,6 +54,7 @@ import android.widget.BaseAdapter;
 import android.widget.Button;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
+import android.widget.ImageView.ScaleType;
 import android.widget.LinearLayout;
 import android.widget.ListAdapter;
 import android.widget.ListView;
@@ -440,6 +444,8 @@ public class DictionaryActivity extends SherlockListActivity {
     private void onCreateSetupActionBarAndSearchView() {
         ActionBar actionBar = getSupportActionBar();
         actionBar.setDisplayShowTitleEnabled(false);
+        actionBar.setDisplayShowHomeEnabled(false);
+        actionBar.setDisplayHomeAsUpEnabled(false);
 
         searchView = new SearchView(getSupportActionBar().getThemedContext());
         searchView.setIconifiedByDefault(false);
@@ -478,6 +484,12 @@ public class DictionaryActivity extends SherlockListActivity {
         searchView.setFocusable(true);
 
         searchHintIcon = (ImageView) searchView.findViewById(R.id.abs__search_mag_icon);
+        // http://stackoverflow.com/questions/2521959/how-to-scale-an-image-in-imageview-to-keep-the-aspect-ratio
+        searchHintIcon.setLayoutParams(new LinearLayout.LayoutParams(
+                application.languageButtonPixels * 3 / 4, LayoutParams.WRAP_CONTENT));
+        searchHintIcon.setScaleType(ScaleType.FIT_CENTER);
+        searchHintIcon.setAdjustViewBounds(true);
+        searchHintIcon.setPadding(1, application.languageButtonPixels / 8, 1, 0);
         searchHintIcon.setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View arg0) {
@@ -684,6 +696,7 @@ public class DictionaryActivity extends SherlockListActivity {
                 layoutParams.width = 0;
                 layoutParams.weight = 1.0f;
                 nameView.setLayoutParams(layoutParams);
+                nameView.setGravity(Gravity.CENTER_VERTICAL);
                 result.addView(nameView);
                 return result;
             }