diff --git a/res/values/untranslatable.xml b/res/values/untranslatable.xml
index 9016af8b..6a5cbaee 100644
--- a/res/values/untranslatable.xml
+++ b/res/values/untranslatable.xml
@@ -51,6 +51,7 @@ THE SOFTWARE.
- EnqueueArtist
- EnqueueGenre
- ClearQueue
+ - ShowQueue
- ToggleControls
- SeekForward
- SeekBackward
@@ -70,6 +71,7 @@ THE SOFTWARE.
- @string/preferences_action_enqueue_current_artist
- @string/preferences_action_enqueue_current_genre
- @string/preferences_action_clear_queue
+ - @string/preferences_action_show_queue
- @string/toggle_controls
- @string/seek_10s_forward
- @string/seek_10s_backward
diff --git a/src/ch/blinkenlights/android/vanilla/Action.java b/src/ch/blinkenlights/android/vanilla/Action.java
index 8a188601..849b5604 100644
--- a/src/ch/blinkenlights/android/vanilla/Action.java
+++ b/src/ch/blinkenlights/android/vanilla/Action.java
@@ -80,6 +80,10 @@ enum Action {
* Clear the queue of all remaining songs.
*/
ClearQueue,
+ /**
+ * Displays the queue
+ */
+ ShowQueue,
/**
* Toggle the controls in the playback activity.
*/
diff --git a/src/ch/blinkenlights/android/vanilla/FullPlaybackActivity.java b/src/ch/blinkenlights/android/vanilla/FullPlaybackActivity.java
index 4d18a445..ceabcdbb 100644
--- a/src/ch/blinkenlights/android/vanilla/FullPlaybackActivity.java
+++ b/src/ch/blinkenlights/android/vanilla/FullPlaybackActivity.java
@@ -613,13 +613,17 @@ public class FullPlaybackActivity extends SlidingPlaybackActivity
}
@Override
- protected void performAction(Action action)
- {
- if (action == Action.ToggleControls) {
- setControlsVisible(!mControlsVisible);
- mHandler.sendEmptyMessage(MSG_SAVE_CONTROLS);
- } else {
- super.performAction(action);
+ protected void performAction(Action action) {
+ switch (action) {
+ case ToggleControls:
+ setControlsVisible(!mControlsVisible);
+ mHandler.sendEmptyMessage(MSG_SAVE_CONTROLS);
+ break;
+ case ShowQueue:
+ mSlidingView.expandSlide();
+ break;
+ default:
+ super.performAction(action);
}
}
diff --git a/src/ch/blinkenlights/android/vanilla/PlaybackService.java b/src/ch/blinkenlights/android/vanilla/PlaybackService.java
index 0ead18de..3a3704f1 100644
--- a/src/ch/blinkenlights/android/vanilla/PlaybackService.java
+++ b/src/ch/blinkenlights/android/vanilla/PlaybackService.java
@@ -2264,7 +2264,8 @@ public final class PlaybackService extends Service
showMirrorLinkSafeToast(R.string.queue_cleared, Toast.LENGTH_SHORT);
break;
case ToggleControls:
- // Handled in FullPlaybackActivity.performAction
+ case ShowQueue:
+ // These are NOOPs here and should be handled in FullPlaybackActivity
break;
case SeekForward:
if (mCurrentSong != null) {