From e9d7391e4408ee073f66e3d3ec39208bbdf3f1fd Mon Sep 17 00:00:00 2001 From: Christopher Eby Date: Fri, 17 Feb 2012 17:06:19 -0600 Subject: [PATCH] Add toggle controls menu item --- res/values/translatable.xml | 6 +++--- src/org/kreed/vanilla/FullPlaybackActivity.java | 16 +++++++++++----- src/org/kreed/vanilla/PlaybackActivity.java | 1 + 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/res/values/translatable.xml b/res/values/translatable.xml index 71740237..68f5cb1f 100644 --- a/res/values/translatable.xml +++ b/res/values/translatable.xml @@ -207,9 +207,9 @@ THE SOFTWARE. Previous album Cycle repeat mode Cycle shuffle mode - Enqueue current album - Enqueue current artist - Enqueue current genre + Enqueue album + Enqueue artist + Enqueue genre Clear queue Toggle controls diff --git a/src/org/kreed/vanilla/FullPlaybackActivity.java b/src/org/kreed/vanilla/FullPlaybackActivity.java index 23cb1436..5bbf995b 100644 --- a/src/org/kreed/vanilla/FullPlaybackActivity.java +++ b/src/org/kreed/vanilla/FullPlaybackActivity.java @@ -283,14 +283,16 @@ public class FullPlaybackActivity extends PlaybackActivity @Override public boolean onCreateOptionsMenu(Menu menu) { - menu.add(0, MENU_ENQUEUE_ALBUM, 0, R.string.enqueue_current_album).setIcon(R.drawable.ic_menu_add); - menu.add(0, MENU_ENQUEUE_ARTIST, 0, R.string.enqueue_current_artist).setIcon(R.drawable.ic_menu_add); - menu.add(0, MENU_ENQUEUE_GENRE, 0, R.string.enqueue_current_genre).setIcon(R.drawable.ic_menu_add); - menu.add(0, MENU_CLEAR_QUEUE, 0, R.string.clear_queue).setIcon(R.drawable.ic_menu_close_clear_cancel); if (Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB) { menu.add(0, MENU_LIBRARY, 0, R.string.library).setIcon(R.drawable.ic_menu_music_library); } - return super.onCreateOptionsMenu(menu); + super.onCreateOptionsMenu(menu); + menu.add(0, MENU_CLEAR_QUEUE, 0, R.string.clear_queue).setIcon(R.drawable.ic_menu_close_clear_cancel); + menu.add(0, MENU_ENQUEUE_ALBUM, 0, R.string.enqueue_current_album).setIcon(R.drawable.ic_menu_add); + menu.add(0, MENU_ENQUEUE_ARTIST, 0, R.string.enqueue_current_artist).setIcon(R.drawable.ic_menu_add); + menu.add(0, MENU_ENQUEUE_GENRE, 0, R.string.enqueue_current_genre).setIcon(R.drawable.ic_menu_add); + menu.add(0, MENU_TOGGLE_CONTROLS, 0, R.string.toggle_controls); + return true; } @Override @@ -313,6 +315,10 @@ public class FullPlaybackActivity extends PlaybackActivity case MENU_CLEAR_QUEUE: PlaybackService.get(this).clearQueue(); break; + case MENU_TOGGLE_CONTROLS: + setControlsVisible(!mControlsVisible); + mHandler.sendEmptyMessage(MSG_SAVE_CONTROLS); + break; default: return super.onOptionsItemSelected(item); } diff --git a/src/org/kreed/vanilla/PlaybackActivity.java b/src/org/kreed/vanilla/PlaybackActivity.java index 12d781ae..2716cf8d 100644 --- a/src/org/kreed/vanilla/PlaybackActivity.java +++ b/src/org/kreed/vanilla/PlaybackActivity.java @@ -314,6 +314,7 @@ public class PlaybackActivity extends Activity static final int MENU_ENQUEUE_ARTIST = 9; static final int MENU_ENQUEUE_GENRE = 10; static final int MENU_CLEAR_QUEUE = 11; + static final int MENU_TOGGLE_CONTROLS = 12; @Override public boolean onCreateOptionsMenu(Menu menu)