From 81281e560e35b7f818472dba01799d469eba960d Mon Sep 17 00:00:00 2001 From: Jimmy Shih Date: Tue, 1 May 2012 18:44:05 -0700 Subject: [PATCH] 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. --- .../io/sendtogoogle/UploadResultActivity.java | 8 ++--- .../apps/mytracks/util/Api11Adapter.java | 36 +++---------------- .../apps/mytracks/util/Api14Adapter.java | 33 +++++++++++++++-- 3 files changed, 39 insertions(+), 38 deletions(-) diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/UploadResultActivity.java b/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/UploadResultActivity.java index 259c8c69f..4324db320 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/UploadResultActivity.java +++ b/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(); - return dialog; + resultDialog = builder.create(); + return resultDialog; } /** @@ -192,6 +192,6 @@ public class UploadResultActivity extends Activity { @VisibleForTesting Dialog getDialog() { - return dialog; + return resultDialog; } } 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 71d61cd2b..87c343190 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/util/Api11Adapter.java +++ b/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, - final int actionModeTitleId, + public void configureListViewContextualMenu(final Activity activity, ListView listView, + 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 diff --git a/MyTracks/src/com/google/android/apps/mytracks/util/Api14Adapter.java b/MyTracks/src/com/google/android/apps/mytracks/util/Api14Adapter.java index 6cc7fb5ee..cd86c0e1d 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/util/Api14Adapter.java +++ b/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();