From fcd3fadc9e06fb8ffcb69678011822540e8cd68a Mon Sep 17 00:00:00 2001 From: Isira Seneviratne Date: Wed, 4 Nov 2020 09:13:24 +0530 Subject: [PATCH] Remove MenuItemCompat usages. --- .../org/fdroid/fdroid/nearby/SwapWorkflowActivity.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/SwapWorkflowActivity.java b/app/src/full/java/org/fdroid/fdroid/nearby/SwapWorkflowActivity.java index 0be72390f..390ec98df 100644 --- a/app/src/full/java/org/fdroid/fdroid/nearby/SwapWorkflowActivity.java +++ b/app/src/full/java/org/fdroid/fdroid/nearby/SwapWorkflowActivity.java @@ -45,7 +45,6 @@ import androidx.appcompat.widget.SearchView; import androidx.appcompat.widget.SwitchCompat; import androidx.appcompat.widget.Toolbar; import androidx.core.content.ContextCompat; -import androidx.core.view.MenuItemCompat; import androidx.localbroadcastmanager.content.LocalBroadcastManager; import com.google.zxing.integration.android.IntentIntegrator; @@ -273,8 +272,7 @@ public class SwapWorkflowActivity extends AppCompatActivity { CharSequence title = getString(titleResId); next.setTitle(title); next.setTitleCondensed(title); - MenuItemCompat.setShowAsAction(next, - MenuItemCompat.SHOW_AS_ACTION_ALWAYS | MenuItemCompat.SHOW_AS_ACTION_WITH_TEXT); + next.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT); next.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() { @Override public boolean onMenuItemClick(MenuItem item) { @@ -303,8 +301,8 @@ public class SwapWorkflowActivity extends AppCompatActivity { SearchView searchView = new SearchView(this); MenuItem searchMenuItem = menu.findItem(R.id.action_search); - MenuItemCompat.setActionView(searchMenuItem, searchView); - MenuItemCompat.setShowAsAction(searchMenuItem, MenuItemCompat.SHOW_AS_ACTION_IF_ROOM); + searchMenuItem.setActionView(searchView); + searchMenuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM); searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {