norohind/vanilla
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Expose the queue-related actions as menu options

Browse Source
This commit is contained in:
Christopher Eby 2012-02-16 00:49:58 -06:00
parent 85033d411e
commit e20f5241cb
6 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
res/drawable-hdpi/ic_menu_add.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.5 KiB

BIN
res/drawable-hdpi/ic_menu_close_clear_cancel.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.1 KiB

BIN
res/drawable-mdpi/ic_menu_add.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
res/drawable-mdpi/ic_menu_close_clear_cancel.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

20
src/org/kreed/vanilla/FullPlaybackActivity.java
View File

@ -283,6 +283,10 @@ 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);
}
@ -296,10 +300,24 @@ public class FullPlaybackActivity extends PlaybackActivity
case android.R.id.home:
case MENU_LIBRARY:
openLibrary(null);
return true;
break;
case MENU_ENQUEUE_ALBUM:
PlaybackService.get(this).enqueueFromCurrent(MediaUtils.TYPE_ALBUM);
break;
case MENU_ENQUEUE_ARTIST:
PlaybackService.get(this).enqueueFromCurrent(MediaUtils.TYPE_ARTIST);
break;
case MENU_ENQUEUE_GENRE:
PlaybackService.get(this).enqueueFromCurrent(MediaUtils.TYPE_GENRE);
break;
case MENU_CLEAR_QUEUE:
PlaybackService.get(this).clearQueue();
break;
default:
return super.onOptionsItemSelected(item);
}
return true;
}
@Override

9
src/org/kreed/vanilla/PlaybackActivity.java
View File

@ -310,6 +310,10 @@ public class PlaybackActivity extends Activity
static final int MENU_LIBRARY = 3;
static final int MENU_PLAYBACK = 5;
static final int MENU_SEARCH = 7;
static final int MENU_ENQUEUE_ALBUM = 8;
static final int MENU_ENQUEUE_ARTIST = 9;
static final int MENU_ENQUEUE_GENRE = 10;
static final int MENU_CLEAR_QUEUE = 11;
@Override
public boolean onCreateOptionsMenu(Menu menu)
@ -369,11 +373,6 @@ public class PlaybackActivity extends Activity
startActivity(intent);
}
public void enqueue(int type)
{
PlaybackService.get(this).enqueueFromCurrent(type);
}
@Override
public void upSwipe()
{