From bd58187c4edda24ac94a67b7db44926cbd8916fb Mon Sep 17 00:00:00 2001 From: Dennis Guse Date: Wed, 17 Jul 2019 22:01:37 +0200 Subject: [PATCH] Activated search in MarkerList. --- .../apps/mytracks/MarkerListActivity.java | 22 +++++++------------ 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/MarkerListActivity.java b/myTracks/src/main/java/com/google/android/apps/mytracks/MarkerListActivity.java index 3d8c7c079..0302512c7 100644 --- a/myTracks/src/main/java/com/google/android/apps/mytracks/MarkerListActivity.java +++ b/myTracks/src/main/java/com/google/android/apps/mytracks/MarkerListActivity.java @@ -96,16 +96,11 @@ public class MarkerListActivity extends AbstractActivity implements DeleteMarker @Override public void onSharedPreferenceChanged(SharedPreferences preferences, String key) { // Note that the key can be null - if (key == null || key.equals( - PreferencesUtils.getKey(MarkerListActivity.this, R.string.recording_track_id_key))) { - recordingTrackId = PreferencesUtils.getLong( - MarkerListActivity.this, R.string.recording_track_id_key); + if (key == null || key.equals(PreferencesUtils.getKey(MarkerListActivity.this, R.string.recording_track_id_key))) { + recordingTrackId = PreferencesUtils.getLong(MarkerListActivity.this, R.string.recording_track_id_key); } - if (key == null || key.equals(PreferencesUtils.getKey( - MarkerListActivity.this, R.string.recording_track_paused_key))) { - recordingTrackPaused = PreferencesUtils.getBoolean(MarkerListActivity.this, - R.string.recording_track_paused_key, - PreferencesUtils.RECORDING_TRACK_PAUSED_DEFAULT); + if (key == null || key.equals(PreferencesUtils.getKey(MarkerListActivity.this, R.string.recording_track_paused_key))) { + recordingTrackPaused = PreferencesUtils.getBoolean(MarkerListActivity.this, R.string.recording_track_paused_key, PreferencesUtils.RECORDING_TRACK_PAUSED_DEFAULT); } if (key != null) { runOnUiThread(new Runnable() { @@ -232,17 +227,18 @@ public class MarkerListActivity extends AbstractActivity implements DeleteMarker @Override public boolean onCreateOptionsMenu(Menu menu) { getMenuInflater().inflate(R.menu.marker_list, menu); + insertMarkerMenuItem = menu.findItem(R.id.marker_list_insert_marker); + searchMenuItem = menu.findItem(R.id.marker_list_search); AbstractTrackActivity.configureSearchWidget(this, searchMenuItem, null); + return super.onCreateOptionsMenu(menu); } @Override public boolean onPrepareOptionsMenu(Menu menu) { - if (insertMarkerMenuItem != null) { - insertMarkerMenuItem.setVisible(track.getId() == recordingTrackId && !recordingTrackPaused); - } + insertMarkerMenuItem.setVisible(track.getId() == recordingTrackId && !recordingTrackPaused); return super.onPrepareOptionsMenu(menu); } @@ -254,8 +250,6 @@ public class MarkerListActivity extends AbstractActivity implements DeleteMarker .putExtra(MarkerEditActivity.EXTRA_TRACK_ID, track.getId()); startActivity(intent); return true; - case R.id.marker_list_search: - return false; default: return super.onOptionsItemSelected(item); }