Fix lint errors.

- MenuItem.collapseActionView is only availble for API level >=14.
- Rename the dialog variable in UploadResultActivity so it doesn't
  conflict with the dialog variable in the callback.

MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/UploadResultActivity.java

@@ -49,7 +49,7 @@ public class UploadResultActivity extends Activity {
   private SendRequest sendRequest;
   private Track track;
   private String shareUrl;
-  private Dialog dialog;
+  private Dialog resultDialog;
   
   @Override
   protected void onCreate(Bundle savedInstanceState) {
@@ -169,8 +169,8 @@ public class UploadResultActivity extends Activity {
             }
           });
     }
-    dialog = builder.create();
+    resultDialog = builder.create();
-    return dialog;
+    return resultDialog;
   }
 
   /**
@@ -192,6 +192,6 @@ public class UploadResultActivity extends Activity {
   
   @VisibleForTesting
   Dialog getDialog() {
-    return dialog;
+    return resultDialog;
   }
 }

MyTracks/src/com/google/android/apps/mytracks/util/Api11Adapter.java

@@ -37,7 +37,7 @@ import java.util.List;
 
 /**
  * API level 11 specific implementation of the {@link ApiAdapter}.
- *
+ * 
  * @author Jimmy Shih
  */
 @TargetApi(11)
@@ -54,12 +54,11 @@ public class Api11Adapter extends Api10Adapter {
   }
 
   @Override
-  public void configureListViewContextualMenu(final Activity activity, ListView listView, final int menuId,
+  public void configureListViewContextualMenu(final Activity activity, ListView listView,
-      final int actionModeTitleId,
+      final int menuId, final int actionModeTitleId,
       final ContextualActionModeCallback contextualActionModeCallback) {
     listView.setOnItemLongClickListener(new OnItemLongClickListener() {
       ActionMode actionMode;
-
       @Override
       public boolean onItemLongClick(
           AdapterView<?> parent, View view, final int position, final long id) {
@@ -72,18 +71,15 @@ public class Api11Adapter extends Api10Adapter {
             mode.getMenuInflater().inflate(menuId, menu);
             return true;
           }
-
           @Override
           public boolean onPrepareActionMode(ActionMode mode, Menu menu) {
             // Return false to indicate no change.
             return false;
           }
-
           @Override
           public void onDestroyActionMode(ActionMode mode) {
             actionMode = null;
           }
-
           @Override
           public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
             mode.finish();
@@ -99,37 +95,13 @@ public class Api11Adapter extends Api10Adapter {
       }
     });
   };
-  
+
   @Override
   public void configureSearchWidget(Activity activity, final MenuItem menuItem) {
     SearchManager searchManager = (SearchManager) activity.getSystemService(Context.SEARCH_SERVICE);
     SearchView searchView = (SearchView) menuItem.getActionView();
     searchView.setSearchableInfo(searchManager.getSearchableInfo(activity.getComponentName()));
     searchView.setQueryRefinementEnabled(true);
-    searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {      
-      @Override
-      public boolean onQueryTextSubmit(String query) {
-        menuItem.collapseActionView();
-        return false;
-      }
-      
-      @Override
-      public boolean onQueryTextChange(String newText) {
-        return false;
-      }
-    });
-    searchView.setOnSuggestionListener(new SearchView.OnSuggestionListener() {      
-      @Override
-      public boolean onSuggestionSelect(int position) {
-        return false;
-      }
-      
-      @Override
-      public boolean onSuggestionClick(int position) {
-        menuItem.collapseActionView();
-        return false;
-      }
-    });
   }
 
   @Override

MyTracks/src/com/google/android/apps/mytracks/util/Api14Adapter.java

@@ -20,10 +20,11 @@ import android.annotation.TargetApi;
 import android.app.ActionBar;
 import android.app.Activity;
 import android.view.MenuItem;
+import android.widget.SearchView;
 
 /**
  * API level 14 specific implementation of the {@link ApiAdapter}.
- *
+ * 
  * @author Jimmy Shih
  */
 @TargetApi(14)
@@ -35,7 +36,35 @@ public class Api14Adapter extends Api11Adapter {
     actionBar.setHomeButtonEnabled(true);
     actionBar.setDisplayHomeAsUpEnabled(true);
   }
-  
+
+  @Override
+  public void configureSearchWidget(Activity activity, final MenuItem menuItem) {
+    super.configureSearchWidget(activity, menuItem);
+    SearchView searchView = (SearchView) menuItem.getActionView();
+    searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
+      @Override
+      public boolean onQueryTextSubmit(String query) {
+        menuItem.collapseActionView();
+        return false;
+      }
+      @Override
+      public boolean onQueryTextChange(String newText) {
+        return false;
+      }
+    });
+    searchView.setOnSuggestionListener(new SearchView.OnSuggestionListener() {
+        @Override
+      public boolean onSuggestionSelect(int position) {
+        return false;
+      }
+      @Override
+      public boolean onSuggestionClick(int position) {
+        menuItem.collapseActionView();
+        return false;
+      }
+    });
+  }
+
   @Override
   public boolean handleSearchKey(MenuItem menuItem) {
     menuItem.expandActionView();