From d7836cce4787a103c9707842d5da962b1026fe0d Mon Sep 17 00:00:00 2001
From: Jimmy Shih <jshih@google.com>
Date: Wed, 16 May 2012 14:14:08 -0700
Subject: [PATCH] Clean up api to configure contextual action mode.

---
 .../google/android/apps/mytracks/MarkerListActivity.java   | 4 ++--
 .../google/android/apps/mytracks/SearchListActivity.java   | 4 ++--
 .../google/android/apps/mytracks/TrackListActivity.java    | 5 ++---
 .../google/android/apps/mytracks/util/Api11Adapter.java    | 6 +++---
 .../com/google/android/apps/mytracks/util/Api7Adapter.java | 4 ++--
 .../com/google/android/apps/mytracks/util/ApiAdapter.java  | 7 ++-----
 6 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/MyTracks/src/com/google/android/apps/mytracks/MarkerListActivity.java b/MyTracks/src/com/google/android/apps/mytracks/MarkerListActivity.java
index c371f61a2..774369cb0 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/MarkerListActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/MarkerListActivity.java
@@ -146,8 +146,8 @@ public class MarkerListActivity extends AbstractMyTracksActivity {
       }
     };
     listView.setAdapter(resourceCursorAdapter);
-    ApiAdapterFactory.getApiAdapter().configureListViewContextualMenu(this, listView,
-        R.menu.list_context_menu, R.id.list_item_name, contextualActionModeCallback);
+    ApiAdapterFactory.getApiAdapter()
+        .configureListViewContextualMenu(this, listView, contextualActionModeCallback);
 
     final long firstWaypointId = MyTracksProviderUtils.Factory.get(this)
         .getFirstWaypointId(trackId);
diff --git a/MyTracks/src/com/google/android/apps/mytracks/SearchListActivity.java b/MyTracks/src/com/google/android/apps/mytracks/SearchListActivity.java
index 7a0ebed17..4863c3195 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/SearchListActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/SearchListActivity.java
@@ -187,8 +187,8 @@ public class SearchListActivity extends AbstractMyTracksActivity implements Dele
       }
     };
     listView.setAdapter(arrayAdapter);
-    ApiAdapterFactory.getApiAdapter().configureListViewContextualMenu(this, listView,
-        R.menu.list_context_menu, R.id.list_item_name, contextualActionModeCallback);
+    ApiAdapterFactory.getApiAdapter()
+        .configureListViewContextualMenu(this, listView, contextualActionModeCallback);
     handleIntent(getIntent());
   }
 
diff --git a/MyTracks/src/com/google/android/apps/mytracks/TrackListActivity.java b/MyTracks/src/com/google/android/apps/mytracks/TrackListActivity.java
index 3339a04a5..e38657f64 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/TrackListActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/TrackListActivity.java
@@ -241,9 +241,8 @@ public class TrackListActivity extends FragmentActivity implements DeleteOneTrac
       }
     };
     listView.setAdapter(resourceCursorAdapter);
-    ApiAdapterFactory.getApiAdapter().configureListViewContextualMenu(
-        this, listView, R.menu.list_context_menu, R.id.list_item_name,
-        contextualActionModeCallback);
+    ApiAdapterFactory.getApiAdapter()
+        .configureListViewContextualMenu(this, listView, contextualActionModeCallback);
    
     getSupportLoaderManager().initLoader(0, null, new LoaderCallbacks<Cursor>() {
       @Override
diff --git a/MyTracks/src/com/google/android/apps/mytracks/util/Api11Adapter.java b/MyTracks/src/com/google/android/apps/mytracks/util/Api11Adapter.java
index 87c343190..ba382b93a 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/util/Api11Adapter.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/util/Api11Adapter.java
@@ -17,6 +17,7 @@
 package com.google.android.apps.mytracks.util;
 
 import com.google.android.apps.mytracks.ContextualActionModeCallback;
+import com.google.android.maps.mytracks.R;
 
 import android.annotation.TargetApi;
 import android.app.Activity;
@@ -55,7 +56,6 @@ public class Api11Adapter extends Api10Adapter {
 
   @Override
   public void configureListViewContextualMenu(final Activity activity, ListView listView,
-      final int menuId, final int actionModeTitleId,
       final ContextualActionModeCallback contextualActionModeCallback) {
     listView.setOnItemLongClickListener(new OnItemLongClickListener() {
       ActionMode actionMode;
@@ -68,7 +68,7 @@ public class Api11Adapter extends Api10Adapter {
         actionMode = activity.startActionMode(new ActionMode.Callback() {
           @Override
           public boolean onCreateActionMode(ActionMode mode, Menu menu) {
-            mode.getMenuInflater().inflate(menuId, menu);
+            mode.getMenuInflater().inflate(R.menu.list_context_menu, menu);
             return true;
           }
           @Override
@@ -86,7 +86,7 @@ public class Api11Adapter extends Api10Adapter {
             return contextualActionModeCallback.onClick(item.getItemId(), position, id);
           }
         });
-        TextView textView = (TextView) view.findViewById(actionModeTitleId);
+        TextView textView = (TextView) view.findViewById(R.id.list_item_name);
         if (textView != null) {
           actionMode.setTitle(textView.getText());
         }
diff --git a/MyTracks/src/com/google/android/apps/mytracks/util/Api7Adapter.java b/MyTracks/src/com/google/android/apps/mytracks/util/Api7Adapter.java
index 79e32effb..78233be64 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/util/Api7Adapter.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/util/Api7Adapter.java
@@ -118,8 +118,8 @@ public class Api7Adapter implements ApiAdapter {
   }
 
   @Override
-  public void configureListViewContextualMenu(Activity activity, ListView listView, int menuId,
-      int actionModeTitleId, ContextualActionModeCallback contextualActionModeCallback) {
+  public void configureListViewContextualMenu(Activity activity, ListView listView,
+      ContextualActionModeCallback contextualActionModeCallback) {
     activity.registerForContextMenu(listView);
   }
 
diff --git a/MyTracks/src/com/google/android/apps/mytracks/util/ApiAdapter.java b/MyTracks/src/com/google/android/apps/mytracks/util/ApiAdapter.java
index 18146a5e9..7eb717401 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/util/ApiAdapter.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/util/ApiAdapter.java
@@ -134,14 +134,11 @@ public interface ApiAdapter {
    *
    * @param activity the activity
    * @param listView the list view
-   * @param menuId the menu resource id
-   * @param actionModeTitleId the id of the list view item TextView to be used
-   *          as the action mode title
    * @param contextualActionModeCallback the callback when an item is selected
    *          in the contextual action mode
    */
-  public void configureListViewContextualMenu(Activity activity, ListView listView, int menuId,
-      int actionModeTitleId, ContextualActionModeCallback contextualActionModeCallback);
+  public void configureListViewContextualMenu(Activity activity, ListView listView,
+      ContextualActionModeCallback contextualActionModeCallback);
 
   /**
    * Configures the search widget.