From 9ec67e28bf5650e87e357afec290f48e0a405bdc Mon Sep 17 00:00:00 2001 From: Adrian Ulrich Date: Sun, 13 May 2018 18:11:43 +0200 Subject: [PATCH] move MENU_GO_HOME control to onPrepareOptionsMenu. This is a special-snowflake menu entry which is only visible in one specific adapter. Let onPrepareOptionsMenu fully manage it to avoid clashes with SlidingPlaybackView's menu entry hider. --- .../ch/blinkenlights/android/vanilla/LibraryActivity.java | 4 +++- .../android/vanilla/SlidingPlaybackActivity.java | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/ch/blinkenlights/android/vanilla/LibraryActivity.java b/app/src/main/java/ch/blinkenlights/android/vanilla/LibraryActivity.java index 0671d860..dfeb7d85 100644 --- a/app/src/main/java/ch/blinkenlights/android/vanilla/LibraryActivity.java +++ b/app/src/main/java/ch/blinkenlights/android/vanilla/LibraryActivity.java @@ -775,7 +775,9 @@ public class LibraryActivity { LibraryAdapter adapter = mCurrentAdapter; menu.findItem(MENU_GO_HOME).setVisible( - adapter != null && adapter.getMediaType() == MediaUtils.TYPE_FILE); + adapter != null && + adapter.getMediaType() == MediaUtils.TYPE_FILE && + !mSlidingView.isExpanded()); return super.onPrepareOptionsMenu(menu); } diff --git a/app/src/main/java/ch/blinkenlights/android/vanilla/SlidingPlaybackActivity.java b/app/src/main/java/ch/blinkenlights/android/vanilla/SlidingPlaybackActivity.java index eef43149..8ee977d3 100644 --- a/app/src/main/java/ch/blinkenlights/android/vanilla/SlidingPlaybackActivity.java +++ b/app/src/main/java/ch/blinkenlights/android/vanilla/SlidingPlaybackActivity.java @@ -332,7 +332,7 @@ public class SlidingPlaybackActivity extends PlaybackActivity final int[] slide_visible = {MENU_HIDE_QUEUE, MENU_CLEAR_QUEUE, MENU_EMPTY_QUEUE, MENU_SAVE_QUEUE}; final int[] slide_hidden = {MENU_SHOW_QUEUE, MENU_SORT, MENU_DELETE, MENU_ENQUEUE, MENU_MORE, - MENU_ADD_TO_PLAYLIST, MENU_SHARE, MENU_GO_HOME}; + MENU_ADD_TO_PLAYLIST, MENU_SHARE}; for (int id : slide_visible) { MenuItem item = mMenu.findItem(id);