diff options
Diffstat (limited to 'app/src/main')
-rw-r--r-- | app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java | 10 | ||||
-rw-r--r-- | app/src/main/res/menu/queue.xml | 17 |
2 files changed, 9 insertions, 18 deletions
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java index ed99cb2dd..c4bef220e 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java @@ -247,16 +247,8 @@ public class QueueFragment extends Fragment implements Toolbar.OnMenuItemClickLi () -> DownloadService.isRunning && DownloadRequester.getInstance().isDownloadingFeeds(); private void refreshToolbarState() { - final MenuItem queueLock = toolbar.getMenu().findItem(R.id.queue_lock); - if (UserPreferences.isQueueLocked()) { - queueLock.setTitle(de.danoeh.antennapod.R.string.unlock_queue); - queueLock.setIcon(R.drawable.ic_lock_open); - } else { - queueLock.setTitle(de.danoeh.antennapod.R.string.lock_queue); - queueLock.setIcon(R.drawable.ic_lock_closed); - } + toolbar.getMenu().findItem(R.id.queue_lock).setChecked(UserPreferences.isQueueLocked()); boolean keepSorted = UserPreferences.isQueueKeepSorted(); - toolbar.getMenu().findItem(R.id.queue_sort_random).setVisible(!keepSorted); toolbar.getMenu().findItem(R.id.queue_keep_sorted).setChecked(keepSorted); isUpdatingFeeds = MenuItemUtils.updateRefreshMenuItem(toolbar.getMenu(), diff --git a/app/src/main/res/menu/queue.xml b/app/src/main/res/menu/queue.xml index 2d341d8e4..c1c2d982c 100644 --- a/app/src/main/res/menu/queue.xml +++ b/app/src/main/res/menu/queue.xml @@ -1,13 +1,12 @@ <?xml version="1.0" encoding="utf-8"?> - <menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:custom="http://schemas.android.com/apk/res-auto"> <item - android:id="@+id/queue_lock" - android:title="" - android:menuCategory="container" - custom:showAsAction="always" /> + android:id="@+id/action_search" + android:icon="@drawable/ic_search" + custom:showAsAction="ifRoom" + android:title="@string/search_label"/> <item android:id="@+id/refresh_item" @@ -17,10 +16,10 @@ android:icon="@drawable/ic_refresh"/> <item - android:id="@+id/action_search" - android:icon="@drawable/ic_search" - custom:showAsAction="ifRoom" - android:title="@string/search_label"/> + android:id="@+id/queue_lock" + android:title="@string/lock_queue" + android:menuCategory="container" + android:checkable="true" /> <item android:id="@+id/queue_sort" |