From 0bd4461c32dca49b10075444d9034de98ca2ad2b Mon Sep 17 00:00:00 2001
From: Jimmy Shih <jshih@google.com>
Date: Thu, 22 Mar 2012 12:12:14 -0700
Subject: [PATCH] merge heads

---
 MyTracks/res/menu/search_only.xml                |  3 ---
 .../google/android/apps/mytracks/TrackList.java  | 16 +++++++++++-----
 .../android/apps/mytracks/WaypointsList.java     | 14 ++++++++++----
 3 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/MyTracks/res/menu/search_only.xml b/MyTracks/res/menu/search_only.xml
index ccf072255..44cd456e8 100644
--- a/MyTracks/res/menu/search_only.xml
+++ b/MyTracks/res/menu/search_only.xml
@@ -15,12 +15,9 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
-
   <item
     android:icon="@android:drawable/ic_menu_search"
     android:id="@+id/menu_search"
-    android:onClick="onSearch"
     android:showAsAction="always"
     android:title="@string/menu_search"/>
-
 </menu>
\ No newline at end of file
diff --git a/MyTracks/src/com/google/android/apps/mytracks/TrackList.java b/MyTracks/src/com/google/android/apps/mytracks/TrackList.java
index 14971c751..9dc6f773b 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/TrackList.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/TrackList.java
@@ -324,6 +324,17 @@ public class TrackList extends ListActivity
     getMenuInflater().inflate(R.menu.search_only, menu);
     return true;
   }
+  
+  @Override
+  public boolean onOptionsItemSelected(MenuItem item) {
+    switch (item.getItemId()) {
+      case R.id.menu_search:
+        onSearchRequested();
+        return true;
+      default:
+        return super.onOptionsItemSelected(item);
+    }
+  }
 
   @Override
   protected Dialog onCreateDialog(int id) {
@@ -389,11 +400,6 @@ public class TrackList extends ListActivity
     }
   }
 
-  /* Callback from menu/search_only.xml */
-  public void onSearch(@SuppressWarnings("unused") MenuItem i) {
-    onSearchRequested();
-  }
-
   private void updateButtonsEnabled() {
     View deleteAll = findViewById(R.id.tracklist_btn_delete_all);
     View exportAll = findViewById(R.id.tracklist_btn_export_all);
diff --git a/MyTracks/src/com/google/android/apps/mytracks/WaypointsList.java b/MyTracks/src/com/google/android/apps/mytracks/WaypointsList.java
index 08819ffa2..85bc8993b 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/WaypointsList.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/WaypointsList.java
@@ -224,10 +224,16 @@ public class WaypointsList extends ListActivity implements View.OnClickListener
     getMenuInflater().inflate(R.menu.search_only, menu);
     return true;
   }
-
-  /* Callback from menu/search_only.xml */
-  public void onSearch(@SuppressWarnings("unused") MenuItem i) {
-    onSearchRequested();
+  
+  @Override
+  public boolean onOptionsItemSelected(MenuItem item) {
+    switch (item.getItemId()) {
+      case R.id.menu_search:
+        onSearchRequested();
+        return true;
+      default:
+        return super.onOptionsItemSelected(item);
+    }
   }
 
   @Override