API change - bug 3370353 and bug 3370338

Change-Id: I9243d9c75e4771a46be2d674e6e172905d613d56
diff --git a/src/com/android/calendar/AllInOneActivity.java b/src/com/android/calendar/AllInOneActivity.java
index 2e02212..69ca70f 100644
--- a/src/com/android/calendar/AllInOneActivity.java
+++ b/src/com/android/calendar/AllInOneActivity.java
@@ -61,7 +61,7 @@
 import java.util.TimeZone;
 
 public class AllInOneActivity extends Activity implements EventHandler,
-        OnSharedPreferenceChangeListener, SearchView.OnQueryChangeListener,
+        OnSharedPreferenceChangeListener, SearchView.OnQueryTextListener,
         ActionBar.TabListener {
     private static final String TAG = "AllInOneActivity";
     private static final boolean DEBUG = false;
@@ -388,7 +388,7 @@
         mSearchView = (SearchView) menu.findItem(R.id.action_search).getActionView();
         if (mSearchView != null) {
             mSearchView.setIconifiedByDefault(true);
-            mSearchView.setOnQueryChangeListener(this);
+            mSearchView.setOnQueryTextListener(this);
             mSearchView.setSubmitButtonEnabled(true);
         }
 
@@ -589,12 +589,12 @@
     }
 
     @Override
-    public boolean onQueryTextChanged(String newText) {
+    public boolean onQueryTextChange(String newText) {
         return false;
     }
 
     @Override
-    public boolean onSubmitQuery(String query) {
+    public boolean onQueryTextSubmit(String query) {
         if (TextUtils.equals(query, "TARDIS")) {
             Utils.tardis();
         }