commit 7a6e1f9f94885642b6459643da1802e77bdddd81
author Adam Powell <adamp@google.com> Thu Jan 20 18:44:53 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jan 20 18:44:53 2011 -0800
tree 3358075932759ad8e3348d684e7a729c8d78e252
parent 2af4a4d2146ea50cb8a586e13a298ec7668ac59d
parent c5792ae6760291d435e91e0fdd28ece6b3311439

Merge "API change - bug 3370353 and bug 3370338" into honeycomb

src/com/android/contacts/activities/ActionBarAdapter.java

diff --git a/src/com/android/contacts/activities/ActionBarAdapter.java b/src/com/android/contacts/activities/ActionBarAdapter.java
index edf722d..9943e2d 100644
--- a/src/com/android/contacts/activities/ActionBarAdapter.java
+++ b/src/com/android/contacts/activities/ActionBarAdapter.java
@@ -32,13 +32,13 @@
 import android.view.View.OnFocusChangeListener;
 import android.widget.SearchView;
 import android.widget.SearchView.OnCloseListener;
-import android.widget.SearchView.OnQueryChangeListener;
+import android.widget.SearchView.OnQueryTextListener;
 import android.widget.TextView;
 
 /**
  * Adapter for the action bar at the top of the Contacts activity.
  */
-public class ActionBarAdapter implements OnQueryChangeListener, OnCloseListener,
+public class ActionBarAdapter implements OnQueryTextListener, OnCloseListener,
         ContactListFilterListener, OnFocusChangeListener {
 
     public interface Listener {
@@ -93,7 +93,7 @@
         mSearchLabel = (TextView) mNavigationBar.findViewById(R.id.search_label);
         mSearchView = (SearchView) mNavigationBar.findViewById(R.id.search_view);
 
-        mSearchView.setOnQueryChangeListener(this);
+        mSearchView.setOnQueryTextListener(this);
         mSearchView.setOnCloseListener(this);
         mSearchView.setOnQueryTextFocusChangeListener(this);
         mSearchView.setQuery(mQueryString, false);
@@ -178,7 +178,7 @@
     }
 
     @Override
-    public boolean onQueryTextChanged(String queryString) {
+    public boolean onQueryTextChange(String queryString) {
         mQueryString = queryString;
         if (!mSearchMode) {
             if (!TextUtils.isEmpty(queryString)) {
@@ -192,7 +192,7 @@
     }
 
     @Override
-    public boolean onSubmitQuery(String query) {
+    public boolean onQueryTextSubmit(String query) {
         return true;
     }
 

src/com/android/contacts/activities/ContactSelectionActivity.java

diff --git a/src/com/android/contacts/activities/ContactSelectionActivity.java b/src/com/android/contacts/activities/ContactSelectionActivity.java
index 278ec63..de81dca 100644
--- a/src/com/android/contacts/activities/ContactSelectionActivity.java
+++ b/src/com/android/contacts/activities/ContactSelectionActivity.java
@@ -41,14 +41,14 @@
 import android.view.View.OnClickListener;
 import android.widget.Button;
 import android.widget.SearchView;
-import android.widget.SearchView.OnQueryChangeListener;
+import android.widget.SearchView.OnQueryTextListener;
 
 /**
  * Displays a list of contacts (or phone numbers or postal addresses) for the
  * purposes of selecting one.
  */
 public class ContactSelectionActivity extends ContactsActivity
-        implements View.OnCreateContextMenuListener, OnQueryChangeListener, OnClickListener {
+        implements View.OnCreateContextMenuListener, OnQueryTextListener, OnClickListener {
     private static final String TAG = "ContactSelectionActivity";
 
     private static final String KEY_ACTION_CODE = "actionCode";
@@ -106,7 +106,7 @@
 
         mSearchView = (SearchView)findViewById(R.id.search_view);
         mSearchView.setQueryHint(getString(R.string.hint_findContacts));
-        mSearchView.setOnQueryChangeListener(this);
+        mSearchView.setOnQueryTextListener(this);
 
         // This is a hack to prevent the search view from grabbing focus
         // at this point.  If search view were visible, it would always grabs focus
@@ -349,14 +349,14 @@
     }
 
     @Override
-    public boolean onQueryTextChanged(String newText) {
+    public boolean onQueryTextChange(String newText) {
         mListFragment.setQueryString(newText, true);
         mListFragment.setSearchMode(!TextUtils.isEmpty(newText));
         return false;
     }
 
     @Override
-    public boolean onSubmitQuery(String query) {
+    public boolean onQueryTextSubmit(String query) {
         return false;
     }