upstream-mirrors/OpenTracks
1
0
Fork 1
mirror of https://codeberg.org/OpenTracksApp/OpenTracks.git synced 2026-10-11 05:23:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Code cleanup. Use Menu.NONE constant when we don't care about

Browse Source 
the groupId or the order.
This commit is contained in:
Jimmy Shih
2012-01-05 18:39:20 -08:00
parent ce05f5b22a
commit 4e9fa91f27
4 changed files with 75 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/src/com/google/android/apps/mytracks/ChartActivity.java
+2 -3
View File
@@ -188,9 +188,8 @@ public class ChartActivity extends Activity implements TrackDataListener {
@Override @Override
public boolean onCreateOptionsMenu(Menu menu) { public boolean onCreateOptionsMenu(Menu menu) {
super.onCreateOptionsMenu(menu); super.onCreateOptionsMenu(menu);
chartSettingsMenuItem = chartSettingsMenuItem = menu.add(Menu.NONE, Constants.MENU_CHART_SETTINGS, Menu.NONE,
menu.add(0, Constants.MENU_CHART_SETTINGS, 0, R.string.menu_chart_view_chart_settings);
R.string.menu_chart_view_chart_settings);
chartSettingsMenuItem.setIcon(R.drawable.chart_settings); chartSettingsMenuItem.setIcon(R.drawable.chart_settings);
return true; return true;
} }
MyTracks/src/com/google/android/apps/mytracks/MapActivity.java
+32 -36
View File
@@ -357,46 +357,42 @@ public class MapActivity extends com.google.android.maps.MapActivity
private final OnCreateContextMenuListener contextMenuListener = private final OnCreateContextMenuListener contextMenuListener =
new OnCreateContextMenuListener() { new OnCreateContextMenuListener() {
@Override @Override
public void onCreateContextMenu(ContextMenu menu, View v, public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) {
ContextMenuInfo menuInfo) {
menu.setHeaderTitle(R.string.track_list_context_menu_title); menu.setHeaderTitle(R.string.track_list_context_menu_title);
menu.add(0, Constants.MENU_EDIT, 0, menu.add(Menu.NONE, Constants.MENU_EDIT, Menu.NONE, R.string.track_list_edit_track);
R.string.track_list_edit_track);
if (!dataHub.isRecordingSelected()) { if (!dataHub.isRecordingSelected()) {
String saveFileFormat = getString(R.string.track_list_save_file); String saveFileFormat = getString(R.string.track_list_save_file);
String shareFileFormat = getString(R.string.track_list_share_file); String shareFileFormat = getString(R.string.track_list_share_file);
String fileTypes[] = getResources().getStringArray(R.array.file_types); 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); R.string.track_list_send_google);
SubMenu share = menu.addSubMenu(0, Constants.MENU_SHARE, 0, SubMenu share = menu.addSubMenu(
R.string.track_list_share_track); Menu.NONE, Constants.MENU_SHARE, Menu.NONE, R.string.track_list_share_track);
share.add(0, Constants.MENU_SHARE_MAP, 0, R.string.track_list_share_map);
share.add( share.add(
0, Constants.MENU_SHARE_FUSION_TABLE, 0, R.string.track_list_share_fusion_table); Menu.NONE, Constants.MENU_SHARE_MAP, Menu.NONE, R.string.track_list_share_map);
share.add( share.add(Menu.NONE, Constants.MENU_SHARE_FUSION_TABLE, Menu.NONE,
0, Constants.MENU_SHARE_GPX_FILE, 0, String.format(shareFileFormat, fileTypes[0])); R.string.track_list_share_fusion_table);
share.add( share.add(Menu.NONE, Constants.MENU_SHARE_GPX_FILE, Menu.NONE,
0, Constants.MENU_SHARE_KML_FILE, 0, String.format(shareFileFormat, fileTypes[1])); String.format(shareFileFormat, fileTypes[0]));
share.add( share.add(Menu.NONE, Constants.MENU_SHARE_KML_FILE, Menu.NONE,
0, Constants.MENU_SHARE_CSV_FILE, 0, String.format(shareFileFormat, fileTypes[2])); String.format(shareFileFormat, fileTypes[1]));
share.add( share.add(Menu.NONE, Constants.MENU_SHARE_CSV_FILE, Menu.NONE,
0, Constants.MENU_SHARE_TCX_FILE, 0, String.format(shareFileFormat, fileTypes[3])); String.format(shareFileFormat, fileTypes[2]));
SubMenu save = menu.addSubMenu(0, share.add(Menu.NONE, Constants.MENU_SHARE_TCX_FILE, Menu.NONE,
Constants.MENU_WRITE_TO_SD_CARD, 0, String.format(shareFileFormat, fileTypes[3]));
R.string.track_list_save_sd); SubMenu save = menu.addSubMenu(
save.add( Menu.NONE, Constants.MENU_WRITE_TO_SD_CARD, Menu.NONE, R.string.track_list_save_sd);
0, Constants.MENU_SAVE_GPX_FILE, 0, String.format(saveFileFormat, fileTypes[0])); save.add(Menu.NONE, Constants.MENU_SAVE_GPX_FILE, Menu.NONE,
save.add( String.format(saveFileFormat, fileTypes[0]));
0, Constants.MENU_SAVE_KML_FILE, 0, String.format(saveFileFormat, fileTypes[1])); save.add(Menu.NONE, Constants.MENU_SAVE_KML_FILE, Menu.NONE,
save.add( String.format(saveFileFormat, fileTypes[1]));
0, Constants.MENU_SAVE_CSV_FILE, 0, String.format(saveFileFormat, fileTypes[2])); save.add(Menu.NONE, Constants.MENU_SAVE_CSV_FILE, Menu.NONE,
save.add( String.format(saveFileFormat, fileTypes[2]));
0, Constants.MENU_SAVE_TCX_FILE, 0, String.format(saveFileFormat, fileTypes[3])); save.add(Menu.NONE, Constants.MENU_SAVE_TCX_FILE, Menu.NONE,
menu.add(0, Constants.MENU_CLEAR_MAP, 0, String.format(saveFileFormat, fileTypes[3]));
R.string.track_list_clear_map); menu.add(Menu.NONE, Constants.MENU_CLEAR_MAP, Menu.NONE, R.string.track_list_clear_map);
menu.add(0, Constants.MENU_DELETE, 0, menu.add(Menu.NONE, Constants.MENU_DELETE, Menu.NONE, R.string.track_list_delete_track);
R.string.track_list_delete_track);
} }
} }
}; };
@@ -448,11 +444,11 @@ public class MapActivity extends com.google.android.maps.MapActivity
@Override @Override
public boolean onCreateOptionsMenu(Menu menu) { public boolean onCreateOptionsMenu(Menu menu) {
super.onCreateOptionsMenu(menu); super.onCreateOptionsMenu(menu);
myLocation = menu.add(0, Constants.MENU_MY_LOCATION, 0, myLocation = menu.add(
R.string.menu_map_view_my_location); Menu.NONE, Constants.MENU_MY_LOCATION, Menu.NONE, R.string.menu_map_view_my_location);
myLocation.setIcon(android.R.drawable.ic_menu_mylocation); myLocation.setIcon(android.R.drawable.ic_menu_mylocation);
toggleLayers = menu.add(0, Constants.MENU_TOGGLE_LAYERS, 0, toggleLayers = menu.add(
R.string.menu_map_view_satellite_mode); Menu.NONE, Constants.MENU_TOGGLE_LAYERS, Menu.NONE, R.string.menu_map_view_satellite_mode);
toggleLayers.setIcon(android.R.drawable.ic_menu_mapmode); toggleLayers.setIcon(android.R.drawable.ic_menu_mapmode);
return true; return true;
} }
MyTracks/src/com/google/android/apps/mytracks/TrackList.java
+32 -37
View File
@@ -39,6 +39,7 @@ import android.os.Handler;
import android.util.Log; import android.util.Log;
import android.view.ContextMenu; import android.view.ContextMenu;
import android.view.ContextMenu.ContextMenuInfo; import android.view.ContextMenu.ContextMenuInfo;
import android.view.Menu;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.SubMenu; import android.view.SubMenu;
import android.view.View; import android.view.View;
@@ -75,51 +76,45 @@ public class TrackList extends ListActivity
private final OnCreateContextMenuListener contextMenuListener = private final OnCreateContextMenuListener contextMenuListener =
new OnCreateContextMenuListener() { new OnCreateContextMenuListener() {
@Override @Override
public void onCreateContextMenu(ContextMenu menu, View v, public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) {
ContextMenuInfo menuInfo) {
menu.setHeaderTitle(R.string.track_list_context_menu_title); menu.setHeaderTitle(R.string.track_list_context_menu_title);
AdapterView.AdapterContextMenuInfo info = AdapterView.AdapterContextMenuInfo info = (AdapterView.AdapterContextMenuInfo) menuInfo;
(AdapterView.AdapterContextMenuInfo) menuInfo;
contextPosition = info.position; contextPosition = info.position;
trackId = TrackList.this.listView.getAdapter().getItemId( trackId = TrackList.this.listView.getAdapter().getItemId(contextPosition);
contextPosition); menu.add(Menu.NONE, Constants.MENU_SHOW, Menu.NONE, R.string.track_list_show_on_map);
menu.add(0, Constants.MENU_SHOW, 0, menu.add(Menu.NONE, Constants.MENU_EDIT, Menu.NONE, R.string.track_list_edit_track);
R.string.track_list_show_on_map);
menu.add(0, Constants.MENU_EDIT, 0,
R.string.track_list_edit_track);
if (!isRecording() || trackId != recordingTrackId) { if (!isRecording() || trackId != recordingTrackId) {
String saveFileFormat = getString(R.string.track_list_save_file); String saveFileFormat = getString(R.string.track_list_save_file);
String shareFileFormat = getString(R.string.track_list_share_file); String shareFileFormat = getString(R.string.track_list_share_file);
String fileTypes[] = getResources().getStringArray(R.array.file_types); 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); R.string.track_list_send_google);
SubMenu share = menu.addSubMenu(0, Constants.MENU_SHARE, 0, SubMenu share = menu.addSubMenu(
R.string.track_list_share_track); Menu.NONE, Constants.MENU_SHARE, Menu.NONE, R.string.track_list_share_track);
share.add(0, Constants.MENU_SHARE_MAP, 0, R.string.track_list_share_map);
share.add( share.add(
0, Constants.MENU_SHARE_FUSION_TABLE, 0, R.string.track_list_share_fusion_table); Menu.NONE, Constants.MENU_SHARE_MAP, Menu.NONE, R.string.track_list_share_map);
share.add( share.add(Menu.NONE, Constants.MENU_SHARE_FUSION_TABLE, Menu.NONE,
0, Constants.MENU_SHARE_GPX_FILE, 0, String.format(shareFileFormat, fileTypes[0])); R.string.track_list_share_fusion_table);
share.add( share.add(Menu.NONE, Constants.MENU_SHARE_GPX_FILE, Menu.NONE,
0, Constants.MENU_SHARE_KML_FILE, 0, String.format(shareFileFormat, fileTypes[1])); String.format(shareFileFormat, fileTypes[0]));
share.add( share.add(Menu.NONE, Constants.MENU_SHARE_KML_FILE, Menu.NONE,
0, Constants.MENU_SHARE_CSV_FILE, 0, String.format(shareFileFormat, fileTypes[2])); String.format(shareFileFormat, fileTypes[1]));
share.add( share.add(Menu.NONE, Constants.MENU_SHARE_CSV_FILE, Menu.NONE,
0, Constants.MENU_SHARE_TCX_FILE, 0, String.format(shareFileFormat, fileTypes[3])); String.format(shareFileFormat, fileTypes[2]));
SubMenu save = menu.addSubMenu(0, share.add(Menu.NONE, Constants.MENU_SHARE_TCX_FILE, Menu.NONE,
Constants.MENU_WRITE_TO_SD_CARD, 0, String.format(shareFileFormat, fileTypes[3]));
R.string.track_list_save_sd); SubMenu save = menu.addSubMenu(
save.add( Menu.NONE, Constants.MENU_WRITE_TO_SD_CARD, Menu.NONE, R.string.track_list_save_sd);
0, Constants.MENU_SAVE_GPX_FILE, 0, String.format(saveFileFormat, fileTypes[0])); save.add(Menu.NONE, Constants.MENU_SAVE_GPX_FILE, Menu.NONE,
save.add( String.format(saveFileFormat, fileTypes[0]));
0, Constants.MENU_SAVE_KML_FILE, 0, String.format(saveFileFormat, fileTypes[1])); save.add(Menu.NONE, Constants.MENU_SAVE_KML_FILE, Menu.NONE,
save.add( String.format(saveFileFormat, fileTypes[1]));
0, Constants.MENU_SAVE_CSV_FILE, 0, String.format(saveFileFormat, fileTypes[2])); save.add(Menu.NONE, Constants.MENU_SAVE_CSV_FILE, Menu.NONE,
save.add( String.format(saveFileFormat, fileTypes[2]));
0, Constants.MENU_SAVE_TCX_FILE, 0, String.format(saveFileFormat, fileTypes[3])); save.add(Menu.NONE, Constants.MENU_SAVE_TCX_FILE, Menu.NONE,
menu.add(0, Constants.MENU_DELETE, 0, String.format(saveFileFormat, fileTypes[3]));
R.string.track_list_delete_track); menu.add(Menu.NONE, Constants.MENU_DELETE, Menu.NONE, R.string.track_list_delete_track);
} }
} }
}; };
MyTracks/src/com/google/android/apps/mytracks/WaypointsList.java
+9 -8
View File
@@ -38,6 +38,7 @@ import android.os.RemoteException;
import android.util.Log; import android.util.Log;
import android.view.ContextMenu; import android.view.ContextMenu;
import android.view.ContextMenu.ContextMenuInfo; import android.view.ContextMenu.ContextMenuInfo;
import android.view.Menu;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.View; import android.view.View;
import android.view.View.OnCreateContextMenuListener; import android.view.View.OnCreateContextMenuListener;
@@ -83,14 +84,14 @@ public class WaypointsList extends ListActivity
Waypoint waypoint = providerUtils.getWaypoint(info.id); Waypoint waypoint = providerUtils.getWaypoint(info.id);
if (waypoint != null) { if (waypoint != null) {
int type = waypoint.getType(); int type = waypoint.getType();
menu.add(0, Constants.MENU_SHOW, 0, menu.add(Menu.NONE, Constants.MENU_SHOW, Menu.NONE, R.string.marker_list_show_on_map);
R.string.marker_list_show_on_map); menu.add(Menu.NONE, Constants.MENU_EDIT, Menu.NONE, R.string.marker_list_edit_marker);
menu.add(0, Constants.MENU_EDIT, 0, MenuItem deleteMenu = menu.add(
R.string.marker_list_edit_marker); Menu.NONE, Constants.MENU_DELETE, Menu.NONE, R.string.marker_list_delete_marker);
menu.add(0, Constants.MENU_DELETE, 0, deleteMenu.setEnabled(recordingTrackId < 0
R.string.marker_list_delete_marker).setEnabled( || type == Waypoint.TYPE_WAYPOINT
recordingTrackId < 0 || type == Waypoint.TYPE_WAYPOINT || type == Waypoint.TYPE_STATISTICS || || type == Waypoint.TYPE_STATISTICS
info.id != providerUtils.getLastWaypointId(recordingTrackId)); || info.id != providerUtils.getLastWaypointId(recordingTrackId));
} }
} }
}; };