Predictive back: for everything except import/export.

Fixes #1708.

src/main/java/de/dennisguse/opentracks/ui/markers/MarkerListActivity.java

@@ -16,7 +16,6 @@
 
 package de.dennisguse.opentracks.ui.markers;
 
-import android.app.SearchManager;
 import android.content.Intent;
 import android.os.Bundle;
 import android.view.Menu;
@@ -25,7 +24,6 @@ import android.view.View;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.UiThread;
-import androidx.appcompat.widget.SearchView;
 import androidx.recyclerview.widget.LinearLayoutManager;
 
 import java.util.List;
@@ -95,7 +93,6 @@ public class MarkerListActivity extends AbstractActivity implements DeleteMarker
         }
     };
     private MenuItem insertMarkerMenuItem;
-    private MenuItem searchMenuItem;
 
     private String searchQuery;
 
@@ -153,6 +150,14 @@ public class MarkerListActivity extends AbstractActivity implements DeleteMarker
     @Override
     protected View getRootView() {
         viewBinding = MarkerListBinding.inflate(getLayoutInflater());
+
+        viewBinding.markerListSearchView.getEditText().setOnEditorActionListener((v, actionId, event) -> {
+            searchQuery = viewBinding.markerListSearchView.getEditText().getText().toString();
+            viewBinding.markerListSearchView.hide();
+            loadData();
+            return true;
+        });
+
         return viewBinding.getRoot();
     }
 
@@ -162,9 +167,6 @@ public class MarkerListActivity extends AbstractActivity implements DeleteMarker
 
         insertMarkerMenuItem = menu.findItem(R.id.marker_list_insert_marker);
 
-        searchMenuItem = menu.findItem(R.id.marker_list_search);
-        ActivityUtils.configureSearchWidget(this, searchMenuItem);
-
         return super.onCreateOptionsMenu(menu);
     }
 
@@ -236,35 +238,10 @@ public class MarkerListActivity extends AbstractActivity implements DeleteMarker
         return false;
     }
 
-    @Override
-    public void onBackPressed() {
-        SearchView searchView = (SearchView) searchMenuItem.getActionView();
-        if (!searchView.isIconified()) {
-            searchView.setIconified(true);
-        }
-
-        if (searchQuery != null) {
-            searchQuery = null;
-            loadData();
-            return;
-        }
-
-        super.onBackPressed();
-    }
-
-    @Override
-    protected void onNewIntent(Intent intent) {
-        super.onNewIntent(intent);
-
-        if (Intent.ACTION_SEARCH.equals(intent.getAction())) {
-            searchQuery = intent.getStringExtra(SearchManager.QUERY);
-        } else {
-            searchQuery = null;
-        }
-    }
-
     @UiThread
     private void loadData() {
+        viewBinding.markerListToolbar.setText(searchQuery);
+
         viewBinding.markerListToolbar.setTitle(Objects.requireNonNullElseGet(searchQuery, () -> getString(R.string.menu_markers)));
 
         List<Marker> markers = contentProviderUtils.searchMarkers(trackId, searchQuery);

src/main/java/de/dennisguse/opentracks/ui/util/ActivityUtils.java

@@ -2,18 +2,13 @@ package de.dennisguse.opentracks.ui.util;
 
 import static android.content.Context.VIBRATOR_SERVICE;
 
-import android.app.Activity;
-import android.app.SearchManager;
 import android.content.Context;
 import android.os.Build;
 import android.os.VibrationEffect;
 import android.os.Vibrator;
-import android.util.Log;
 import android.view.Menu;
-import android.view.MenuItem;
 
 import androidx.annotation.NonNull;
-import androidx.appcompat.widget.SearchView;
 
 import java.time.Duration;
 
@@ -21,19 +16,6 @@ public class ActivityUtils {
 
     private static final String TAG = ActivityUtils.class.getSimpleName();
 
-    public static SearchView configureSearchWidget(Activity activity, final MenuItem menuItem) {
-        final SearchView searchView = (SearchView) menuItem.getActionView();
-        SearchManager searchManager = (SearchManager) activity.getSystemService(Context.SEARCH_SERVICE);
-        if (searchManager != null) {
-            //NOTE: Use searchManager.getSearchableInfo(new ComponentName(activity, SearchActivity.class)) if another activity should handle the search
-            searchView.setSearchableInfo(searchManager.getSearchableInfo(activity.getComponentName()));
-        } else {
-            Log.w(TAG, "Could not retrieve SearchManager.");
-        }
-        searchView.setSubmitButtonEnabled(true);
-        return searchView;
-    }
-
     public static void vibrate(@NonNull Context context, Duration duration) {
         final Vibrator vibrator = (Vibrator) context.getSystemService(VIBRATOR_SERVICE);
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {