Added to SearchView : getQuery() and setOnSearchClickListener()

Bug: 3083393
Bug: 3172295

2 files changed, 50 insertions, 0 deletions

diff --git a/api/current.xml b/api/current.xml
index 00e242e8f882..1687d5aeba3c 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -243571,6 +243571,17 @@
 <parameter name="attrs" type="android.util.AttributeSet">
 </parameter>
 </constructor>
+<method name="getQuery"
+ return="java.lang.CharSequence"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
 <method name="getSuggestionsAdapter"
  return="android.widget.CursorAdapter"
  abstract="false"
@@ -243704,6 +243715,19 @@
 <parameter name="listener" type="android.view.View.OnFocusChangeListener">
 </parameter>
 </method>
+<method name="setOnSearchClickListener"
+ return="void"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="listener" type="android.view.View.OnClickListener">
+</parameter>
+</method>
 <method name="setOnSuggestionSelectionListener"
  return="void"
  abstract="false"
diff --git a/core/java/android/widget/SearchView.java b/core/java/android/widget/SearchView.java
index b296b7734d83..b32bd42a8d9a 100644
--- a/core/java/android/widget/SearchView.java
+++ b/core/java/android/widget/SearchView.java
@@ -44,6 +44,7 @@ import android.util.Log;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.view.View.OnClickListener;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.AdapterView.OnItemClickListener;
 import android.widget.AdapterView.OnItemSelectedListener;
@@ -76,6 +77,7 @@ public class SearchView extends LinearLayout {
     private OnCloseListener mOnCloseListener;
     private OnFocusChangeListener mOnQueryTextFocusChangeListener;
     private OnSuggestionSelectionListener mOnSuggestionListener;
+    private OnClickListener mOnSearchClickListener;
 
     private boolean mIconifiedByDefault;
     private boolean mIconified;
@@ -301,6 +303,27 @@ public class SearchView extends LinearLayout {
     }
 
     /**
+     * Sets a listener to inform when the search button is pressed. This is only
+     * relevant when the text field is not visible by default. Calling #setIconified(false)
+     * can also cause this listener to be informed.
+     *
+     * @param listener the listener to inform when the search button is clicked or
+     * the text field is programmatically de-iconified.
+     */
+    public void setOnSearchClickListener(OnClickListener listener) {
+        mOnSearchClickListener = listener;
+    }
+
+    /**
+     * Returns the query string currently in the text field.
+     *
+     * @return the query string
+     */
+    public CharSequence getQuery() {
+        return mQueryTextView.getText();
+    }
+
+    /**
      * Sets a query string in the text field and optionally submits the query as well.
      *
      * @param query the query string. This replaces any query text already present in the
@@ -831,6 +854,9 @@ public class SearchView extends LinearLayout {
         mQueryTextView.requestFocus();
         updateViewsVisibility(false);
         setImeVisibility(true);
+        if (mOnSearchClickListener != null) {
+            mOnSearchClickListener.onClick(this);
+        }
     }
 
     private void onVoiceClicked() {