OI Safe: soft keyboard on Search now offers a search button

git-svn-id: http://openintents.googlecode.com/svn/trunk/Safe@2348 72b678ce-9140-0410-bee8-679b907dd61a

diff --git a/res/layout/search.xml b/res/layout/search.xml
index d9a5f9b8862d034da840ba4a868ac326aba0c9e3..83d61266537349801d83a2d451ff0591202aaa92 100644 (file)
--- a/res/layout/search.xml
+++ b/res/layout/search.xml
@@ -29,6 +29,8 @@
                                android:layout_width="wrap_content"
                                android:layout_height="wrap_content"
                                android:inputType="textFilter"
+                               android:imeOptions="actionSearch"
+                               android:imeActionLabel="@string/search"
                                android:maxLength="50"
                                android:hint="@string/search_hint" 
                                android:layout_weight="1"/>

diff --git a/src/org/openintents/safe/Search.java b/src/org/openintents/safe/Search.java
index ebb2fe908d941c4c54ca2c01a8c0c4ab9d8966c4..388200b7ea7a9b0473fc233dc04331e18cbc2dc0 100644 (file)
--- a/src/org/openintents/safe/Search.java
+++ b/src/org/openintents/safe/Search.java
@@ -33,10 +33,14 @@ import android.os.Handler;
 import android.os.Message;
 import android.util.Log;
 import android.view.View;
+import android.view.KeyEvent;
+import android.view.inputmethod.EditorInfo;
+import android.view.inputmethod.InputMethodManager;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ListView;
+import android.widget.TextView;
 import android.widget.Toast;
 
 public class Search extends ListActivity {
@@ -110,7 +114,21 @@ public class Search extends ListActivity {
                                searchThreadStart();
                        }
                });
-               
+
+               etSearchCriteria.setOnEditorActionListener(new TextView.OnEditorActionListener() {
+                   public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
+                       if (actionId == EditorInfo.IME_ACTION_SEARCH) {
+                               InputMethodManager imm =
+                                       (InputMethodManager)getSystemService(Context.INPUT_METHOD_SERVICE);
+                               imm.toggleSoftInput(0, 0);
+                                       searchCriteria = etSearchCriteria.getText().toString().trim().toLowerCase();
+                                       searchThreadStart();
+                           return true;
+                       }
+                       return false;
+                   }
+               });
+
                restoreMe();
     }