From 4e9fa91f274290d94b22c114d4a163520e2ea134 Mon Sep 17 00:00:00 2001 From: Jimmy Shih Date: Thu, 5 Jan 2012 18:39:20 -0800 Subject: [PATCH] Code cleanup. Use Menu.NONE constant when we don't care about the groupId or the order. --- .../android/apps/mytracks/ChartActivity.java | 5 +- .../android/apps/mytracks/MapActivity.java | 68 +++++++++--------- .../android/apps/mytracks/TrackList.java | 69 +++++++++---------- .../android/apps/mytracks/WaypointsList.java | 17 ++--- 4 files changed, 75 insertions(+), 84 deletions(-) diff --git a/MyTracks/src/com/google/android/apps/mytracks/ChartActivity.java b/MyTracks/src/com/google/android/apps/mytracks/ChartActivity.java index dba42f849..fbc24fcdf 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/ChartActivity.java +++ b/MyTracks/src/com/google/android/apps/mytracks/ChartActivity.java @@ -188,9 +188,8 @@ public class ChartActivity extends Activity implements TrackDataListener { @Override public boolean onCreateOptionsMenu(Menu menu) { super.onCreateOptionsMenu(menu); - chartSettingsMenuItem = - menu.add(0, Constants.MENU_CHART_SETTINGS, 0, - R.string.menu_chart_view_chart_settings); + chartSettingsMenuItem = menu.add(Menu.NONE, Constants.MENU_CHART_SETTINGS, Menu.NONE, + R.string.menu_chart_view_chart_settings); chartSettingsMenuItem.setIcon(R.drawable.chart_settings); return true; } diff --git a/MyTracks/src/com/google/android/apps/mytracks/MapActivity.java b/MyTracks/src/com/google/android/apps/mytracks/MapActivity.java index 335bb27ca..1f7e47e7a 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/MapActivity.java +++ b/MyTracks/src/com/google/android/apps/mytracks/MapActivity.java @@ -357,46 +357,42 @@ public class MapActivity extends com.google.android.maps.MapActivity private final OnCreateContextMenuListener contextMenuListener = new OnCreateContextMenuListener() { @Override - public void onCreateContextMenu(ContextMenu menu, View v, - ContextMenuInfo menuInfo) { + public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) { menu.setHeaderTitle(R.string.track_list_context_menu_title); - menu.add(0, Constants.MENU_EDIT, 0, - R.string.track_list_edit_track); + menu.add(Menu.NONE, Constants.MENU_EDIT, Menu.NONE, R.string.track_list_edit_track); if (!dataHub.isRecordingSelected()) { String saveFileFormat = getString(R.string.track_list_save_file); String shareFileFormat = getString(R.string.track_list_share_file); String fileTypes[] = getResources().getStringArray(R.array.file_types); - menu.add(0, Constants.MENU_SEND_TO_GOOGLE, 0, + menu.add(Menu.NONE, Constants.MENU_SEND_TO_GOOGLE, Menu.NONE, R.string.track_list_send_google); - SubMenu share = menu.addSubMenu(0, Constants.MENU_SHARE, 0, - R.string.track_list_share_track); - share.add(0, Constants.MENU_SHARE_MAP, 0, R.string.track_list_share_map); + SubMenu share = menu.addSubMenu( + Menu.NONE, Constants.MENU_SHARE, Menu.NONE, R.string.track_list_share_track); share.add( - 0, Constants.MENU_SHARE_FUSION_TABLE, 0, R.string.track_list_share_fusion_table); - share.add( - 0, Constants.MENU_SHARE_GPX_FILE, 0, String.format(shareFileFormat, fileTypes[0])); - share.add( - 0, Constants.MENU_SHARE_KML_FILE, 0, String.format(shareFileFormat, fileTypes[1])); - share.add( - 0, Constants.MENU_SHARE_CSV_FILE, 0, String.format(shareFileFormat, fileTypes[2])); - share.add( - 0, Constants.MENU_SHARE_TCX_FILE, 0, String.format(shareFileFormat, fileTypes[3])); - SubMenu save = menu.addSubMenu(0, - Constants.MENU_WRITE_TO_SD_CARD, 0, - R.string.track_list_save_sd); - save.add( - 0, Constants.MENU_SAVE_GPX_FILE, 0, String.format(saveFileFormat, fileTypes[0])); - save.add( - 0, Constants.MENU_SAVE_KML_FILE, 0, String.format(saveFileFormat, fileTypes[1])); - save.add( - 0, Constants.MENU_SAVE_CSV_FILE, 0, String.format(saveFileFormat, fileTypes[2])); - save.add( - 0, Constants.MENU_SAVE_TCX_FILE, 0, String.format(saveFileFormat, fileTypes[3])); - menu.add(0, Constants.MENU_CLEAR_MAP, 0, - R.string.track_list_clear_map); - menu.add(0, Constants.MENU_DELETE, 0, - R.string.track_list_delete_track); + Menu.NONE, Constants.MENU_SHARE_MAP, Menu.NONE, R.string.track_list_share_map); + share.add(Menu.NONE, Constants.MENU_SHARE_FUSION_TABLE, Menu.NONE, + R.string.track_list_share_fusion_table); + share.add(Menu.NONE, Constants.MENU_SHARE_GPX_FILE, Menu.NONE, + String.format(shareFileFormat, fileTypes[0])); + share.add(Menu.NONE, Constants.MENU_SHARE_KML_FILE, Menu.NONE, + String.format(shareFileFormat, fileTypes[1])); + share.add(Menu.NONE, Constants.MENU_SHARE_CSV_FILE, Menu.NONE, + String.format(shareFileFormat, fileTypes[2])); + share.add(Menu.NONE, Constants.MENU_SHARE_TCX_FILE, Menu.NONE, + String.format(shareFileFormat, fileTypes[3])); + SubMenu save = menu.addSubMenu( + Menu.NONE, Constants.MENU_WRITE_TO_SD_CARD, Menu.NONE, R.string.track_list_save_sd); + save.add(Menu.NONE, Constants.MENU_SAVE_GPX_FILE, Menu.NONE, + String.format(saveFileFormat, fileTypes[0])); + save.add(Menu.NONE, Constants.MENU_SAVE_KML_FILE, Menu.NONE, + String.format(saveFileFormat, fileTypes[1])); + save.add(Menu.NONE, Constants.MENU_SAVE_CSV_FILE, Menu.NONE, + String.format(saveFileFormat, fileTypes[2])); + save.add(Menu.NONE, Constants.MENU_SAVE_TCX_FILE, Menu.NONE, + String.format(saveFileFormat, fileTypes[3])); + menu.add(Menu.NONE, Constants.MENU_CLEAR_MAP, Menu.NONE, R.string.track_list_clear_map); + menu.add(Menu.NONE, Constants.MENU_DELETE, Menu.NONE, R.string.track_list_delete_track); } } }; @@ -448,11 +444,11 @@ public class MapActivity extends com.google.android.maps.MapActivity @Override public boolean onCreateOptionsMenu(Menu menu) { super.onCreateOptionsMenu(menu); - myLocation = menu.add(0, Constants.MENU_MY_LOCATION, 0, - R.string.menu_map_view_my_location); + myLocation = menu.add( + Menu.NONE, Constants.MENU_MY_LOCATION, Menu.NONE, R.string.menu_map_view_my_location); myLocation.setIcon(android.R.drawable.ic_menu_mylocation); - toggleLayers = menu.add(0, Constants.MENU_TOGGLE_LAYERS, 0, - R.string.menu_map_view_satellite_mode); + toggleLayers = menu.add( + Menu.NONE, Constants.MENU_TOGGLE_LAYERS, Menu.NONE, R.string.menu_map_view_satellite_mode); toggleLayers.setIcon(android.R.drawable.ic_menu_mapmode); return true; } diff --git a/MyTracks/src/com/google/android/apps/mytracks/TrackList.java b/MyTracks/src/com/google/android/apps/mytracks/TrackList.java index 191bc359d..11b0de61f 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/TrackList.java +++ b/MyTracks/src/com/google/android/apps/mytracks/TrackList.java @@ -39,6 +39,7 @@ import android.os.Handler; import android.util.Log; import android.view.ContextMenu; import android.view.ContextMenu.ContextMenuInfo; +import android.view.Menu; import android.view.MenuItem; import android.view.SubMenu; import android.view.View; @@ -75,51 +76,45 @@ public class TrackList extends ListActivity private final OnCreateContextMenuListener contextMenuListener = new OnCreateContextMenuListener() { @Override - public void onCreateContextMenu(ContextMenu menu, View v, - ContextMenuInfo menuInfo) { + public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) { menu.setHeaderTitle(R.string.track_list_context_menu_title); - AdapterView.AdapterContextMenuInfo info = - (AdapterView.AdapterContextMenuInfo) menuInfo; + AdapterView.AdapterContextMenuInfo info = (AdapterView.AdapterContextMenuInfo) menuInfo; contextPosition = info.position; - trackId = TrackList.this.listView.getAdapter().getItemId( - contextPosition); - menu.add(0, Constants.MENU_SHOW, 0, - R.string.track_list_show_on_map); - menu.add(0, Constants.MENU_EDIT, 0, - R.string.track_list_edit_track); + trackId = TrackList.this.listView.getAdapter().getItemId(contextPosition); + menu.add(Menu.NONE, Constants.MENU_SHOW, Menu.NONE, R.string.track_list_show_on_map); + menu.add(Menu.NONE, Constants.MENU_EDIT, Menu.NONE, R.string.track_list_edit_track); if (!isRecording() || trackId != recordingTrackId) { String saveFileFormat = getString(R.string.track_list_save_file); String shareFileFormat = getString(R.string.track_list_share_file); String fileTypes[] = getResources().getStringArray(R.array.file_types); - - menu.add(0, Constants.MENU_SEND_TO_GOOGLE, 0, + + menu.add(Menu.NONE, Constants.MENU_SEND_TO_GOOGLE, Menu.NONE, R.string.track_list_send_google); - SubMenu share = menu.addSubMenu(0, Constants.MENU_SHARE, 0, - R.string.track_list_share_track); - share.add(0, Constants.MENU_SHARE_MAP, 0, R.string.track_list_share_map); + SubMenu share = menu.addSubMenu( + Menu.NONE, Constants.MENU_SHARE, Menu.NONE, R.string.track_list_share_track); share.add( - 0, Constants.MENU_SHARE_FUSION_TABLE, 0, R.string.track_list_share_fusion_table); - share.add( - 0, Constants.MENU_SHARE_GPX_FILE, 0, String.format(shareFileFormat, fileTypes[0])); - share.add( - 0, Constants.MENU_SHARE_KML_FILE, 0, String.format(shareFileFormat, fileTypes[1])); - share.add( - 0, Constants.MENU_SHARE_CSV_FILE, 0, String.format(shareFileFormat, fileTypes[2])); - share.add( - 0, Constants.MENU_SHARE_TCX_FILE, 0, String.format(shareFileFormat, fileTypes[3])); - SubMenu save = menu.addSubMenu(0, - Constants.MENU_WRITE_TO_SD_CARD, 0, - R.string.track_list_save_sd); - save.add( - 0, Constants.MENU_SAVE_GPX_FILE, 0, String.format(saveFileFormat, fileTypes[0])); - save.add( - 0, Constants.MENU_SAVE_KML_FILE, 0, String.format(saveFileFormat, fileTypes[1])); - save.add( - 0, Constants.MENU_SAVE_CSV_FILE, 0, String.format(saveFileFormat, fileTypes[2])); - save.add( - 0, Constants.MENU_SAVE_TCX_FILE, 0, String.format(saveFileFormat, fileTypes[3])); - menu.add(0, Constants.MENU_DELETE, 0, - R.string.track_list_delete_track); + Menu.NONE, Constants.MENU_SHARE_MAP, Menu.NONE, R.string.track_list_share_map); + share.add(Menu.NONE, Constants.MENU_SHARE_FUSION_TABLE, Menu.NONE, + R.string.track_list_share_fusion_table); + share.add(Menu.NONE, Constants.MENU_SHARE_GPX_FILE, Menu.NONE, + String.format(shareFileFormat, fileTypes[0])); + share.add(Menu.NONE, Constants.MENU_SHARE_KML_FILE, Menu.NONE, + String.format(shareFileFormat, fileTypes[1])); + share.add(Menu.NONE, Constants.MENU_SHARE_CSV_FILE, Menu.NONE, + String.format(shareFileFormat, fileTypes[2])); + share.add(Menu.NONE, Constants.MENU_SHARE_TCX_FILE, Menu.NONE, + String.format(shareFileFormat, fileTypes[3])); + SubMenu save = menu.addSubMenu( + Menu.NONE, Constants.MENU_WRITE_TO_SD_CARD, Menu.NONE, R.string.track_list_save_sd); + save.add(Menu.NONE, Constants.MENU_SAVE_GPX_FILE, Menu.NONE, + String.format(saveFileFormat, fileTypes[0])); + save.add(Menu.NONE, Constants.MENU_SAVE_KML_FILE, Menu.NONE, + String.format(saveFileFormat, fileTypes[1])); + save.add(Menu.NONE, Constants.MENU_SAVE_CSV_FILE, Menu.NONE, + String.format(saveFileFormat, fileTypes[2])); + save.add(Menu.NONE, Constants.MENU_SAVE_TCX_FILE, Menu.NONE, + String.format(saveFileFormat, fileTypes[3])); + menu.add(Menu.NONE, Constants.MENU_DELETE, Menu.NONE, R.string.track_list_delete_track); } } }; diff --git a/MyTracks/src/com/google/android/apps/mytracks/WaypointsList.java b/MyTracks/src/com/google/android/apps/mytracks/WaypointsList.java index 9d5513108..a9648de6c 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/WaypointsList.java +++ b/MyTracks/src/com/google/android/apps/mytracks/WaypointsList.java @@ -38,6 +38,7 @@ import android.os.RemoteException; import android.util.Log; import android.view.ContextMenu; import android.view.ContextMenu.ContextMenuInfo; +import android.view.Menu; import android.view.MenuItem; import android.view.View; import android.view.View.OnCreateContextMenuListener; @@ -83,14 +84,14 @@ public class WaypointsList extends ListActivity Waypoint waypoint = providerUtils.getWaypoint(info.id); if (waypoint != null) { int type = waypoint.getType(); - menu.add(0, Constants.MENU_SHOW, 0, - R.string.marker_list_show_on_map); - menu.add(0, Constants.MENU_EDIT, 0, - R.string.marker_list_edit_marker); - menu.add(0, Constants.MENU_DELETE, 0, - R.string.marker_list_delete_marker).setEnabled( - recordingTrackId < 0 || type == Waypoint.TYPE_WAYPOINT || type == Waypoint.TYPE_STATISTICS || - info.id != providerUtils.getLastWaypointId(recordingTrackId)); + menu.add(Menu.NONE, Constants.MENU_SHOW, Menu.NONE, R.string.marker_list_show_on_map); + menu.add(Menu.NONE, Constants.MENU_EDIT, Menu.NONE, R.string.marker_list_edit_marker); + MenuItem deleteMenu = menu.add( + Menu.NONE, Constants.MENU_DELETE, Menu.NONE, R.string.marker_list_delete_marker); + deleteMenu.setEnabled(recordingTrackId < 0 + || type == Waypoint.TYPE_WAYPOINT + || type == Waypoint.TYPE_STATISTICS + || info.id != providerUtils.getLastWaypointId(recordingTrackId)); } } };