Relayout search bar to improve usability, use ImageButton for clear

button, default drawable on 11 and higher.

diff --git a/res/layout/dictionary_activity.xml b/res/layout/dictionary_activity.xml
index 0a070573ffde37952fb9942a1295f62cad5ba145..cf514158e8ba2528b63cef7c899a86ff3b8e1ba5 100644 (file)
--- a/res/layout/dictionary_activity.xml
+++ b/res/layout/dictionary_activity.xml
@@ -9,6 +9,14 @@
         android:layout_width="fill_parent"
         android:layout_height="wrap_content" >
 
+        <Button
+            android:id="@+id/LangButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:maxLines="1"
+            android:minWidth="50dip"
+            android:text="" />
+
         <EditText
             android:id="@+id/SearchText"
             android:layout_width="0dip"
@@ -18,22 +26,13 @@
             android:imeOptions="actionSearch|flagNoEnterAction|flagNoExtractUi"
             android:inputType="text" />
 
-        <Button
+        <ImageButton
             android:id="@+id/ClearSearchTextButton"
+            style="@style/BorderlessButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginRight="15dip"
-            android:background="#00000000"
-            android:drawableLeft="@drawable/ic_input_delete" />
-        <!-- transparent -->
-
-        <Button
-            android:id="@+id/LangButton"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:maxLines="1"
-            android:minWidth="50dip"
-            android:text="" />
+            android:padding="@dimen/default_padding"
+            android:src="@drawable/ic_input_delete" />
 
         <Button
             android:id="@+id/DownButton"

diff --git a/src/com/hughes/android/dictionary/DictionaryActivity.java b/src/com/hughes/android/dictionary/DictionaryActivity.java
index f86646227fad8cec62e8014c253e182939fd856e..c0e571181d7319ad2eb98c6f197cffb0e122bb43 100644 (file)
--- a/src/com/hughes/android/dictionary/DictionaryActivity.java
+++ b/src/com/hughes/android/dictionary/DictionaryActivity.java
@@ -310,10 +310,10 @@ public class DictionaryActivity extends ListActivity {
         setSearchText(text, true);
         Log.d(LOG, "Trying to restore searchText=" + text);
 
-        final Button clearSearchTextButton = (Button) findViewById(R.id.ClearSearchTextButton);
+        final View clearSearchTextButton = findViewById(R.id.ClearSearchTextButton);
         clearSearchTextButton.setOnClickListener(new OnClickListener() {
             public void onClick(View v) {
-                onClearSearchTextButton(clearSearchTextButton);
+                onClearSearchTextButton();
             }
         });
         clearSearchTextButton.setVisibility(PreferenceManager.getDefaultSharedPreferences(this)
@@ -444,7 +444,7 @@ public class DictionaryActivity extends ListActivity {
     // Buttons
     // --------------------------------------------------------------------------
 
-    private void onClearSearchTextButton(final Button clearSearchTextButton) {
+    private void onClearSearchTextButton() {
         setSearchText("", true);
         Log.d(LOG, "Trying to show soft keyboard.");
         final InputMethodManager manager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);