Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace deprecated methods introduced

Browse Source
This commit is contained in:
proletarius101 2021-02-26 19:04:12 +08:00 committed by Hans-Christoph Steiner
parent b5ab4eb978
commit f8f48e1be4
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/full/java/org/fdroid/fdroid/nearby/SwapWorkflowActivity.java
View File

@ -44,7 +44,6 @@ import androidx.appcompat.widget.SearchView;
import androidx.appcompat.widget.SwitchCompat; import androidx.appcompat.widget.SwitchCompat;
import androidx.appcompat.widget.Toolbar; import androidx.appcompat.widget.Toolbar;
import androidx.core.content.ContextCompat; import androidx.core.content.ContextCompat;
import androidx.core.view.MenuItemCompat;
import androidx.localbroadcastmanager.content.LocalBroadcastManager; import androidx.localbroadcastmanager.content.LocalBroadcastManager;
import com.google.zxing.integration.android.IntentIntegrator; import com.google.zxing.integration.android.IntentIntegrator;
@ -273,7 +272,7 @@ public class SwapWorkflowActivity extends AppCompatActivity {
CharSequence title = getString(titleResId); CharSequence title = getString(titleResId);
next.setTitle(title); next.setTitle(title);
next.setTitleCondensed(title); next.setTitleCondensed(title);
MenuItemCompat.setShowAsAction(next, MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT); next.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT);
next.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() { next.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
@Override @Override
public boolean onMenuItemClick(MenuItem item) { public boolean onMenuItemClick(MenuItem item) {
@ -302,8 +301,8 @@ public class SwapWorkflowActivity extends AppCompatActivity {
SearchView searchView = new SearchView(this); SearchView searchView = new SearchView(this);
MenuItem searchMenuItem = menu.findItem(R.id.action_search); MenuItem searchMenuItem = menu.findItem(R.id.action_search);
MenuItemCompat.setActionView(searchMenuItem, searchView); searchMenuItem.setActionView(searchView);
MenuItemCompat.setShowAsAction(searchMenuItem, MenuItem.SHOW_AS_ACTION_IF_ROOM); searchMenuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() { searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {

4
app/src/full/java/org/fdroid/fdroid/panic/SelectInstalledAppsActivity.java
View File

@ -30,7 +30,7 @@ import android.widget.TextView;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.widget.Toolbar; import androidx.appcompat.widget.Toolbar;
import androidx.core.view.MenuItemCompat; import androidx.core.content.ContextCompat;
import androidx.loader.app.LoaderManager; import androidx.loader.app.LoaderManager;
import androidx.loader.content.CursorLoader; import androidx.loader.content.CursorLoader;
import androidx.loader.content.Loader; import androidx.loader.content.Loader;
@ -113,7 +113,7 @@ public class SelectInstalledAppsActivity extends AppCompatActivity implements Lo
@Override @Override
public boolean onCreateOptionsMenu(Menu menu) { public boolean onCreateOptionsMenu(Menu menu) {
MenuItem menuItem = menu.add(R.string.menu_select_for_wipe); MenuItem menuItem = menu.add(R.string.menu_select_for_wipe);
MenuItemCompat.setShowAsAction(menuItem, MenuItem.SHOW_AS_ACTION_ALWAYS); menuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
checkId = menuItem.getItemId(); checkId = menuItem.getItemId();
menuItem.setIcon(R.drawable.check); menuItem.setIcon(R.drawable.check);
return true; return true;