karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity

Activated search in MarkerList.

Browse Source
This commit is contained in:
Dennis Guse
2019-07-17 22:01:37 +02:00
parent 330c6b09cf
commit bd58187c4e
1 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
myTracks/src/main/java/com/google/android/apps/mytracks/MarkerListActivity.java
+8 -14
View File
@@ -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);
}