From e20f5241cb290d4602b1627ab335fd41f4ba7316 Mon Sep 17 00:00:00 2001 From: Christopher Eby Date: Thu, 16 Feb 2012 00:49:58 -0600 Subject: [PATCH] Expose the queue-related actions as menu options --- res/drawable-hdpi/ic_menu_add.png | Bin 0 -> 2607 bytes .../ic_menu_close_clear_cancel.png | Bin 0 -> 3209 bytes res/drawable-mdpi/ic_menu_add.png | Bin 0 -> 1734 bytes .../ic_menu_close_clear_cancel.png | Bin 0 -> 1997 bytes .../kreed/vanilla/FullPlaybackActivity.java | 20 +++++++++++++++++- src/org/kreed/vanilla/PlaybackActivity.java | 9 ++++---- 6 files changed, 23 insertions(+), 6 deletions(-) create mode 100644 res/drawable-hdpi/ic_menu_add.png create mode 100644 res/drawable-hdpi/ic_menu_close_clear_cancel.png create mode 100644 res/drawable-mdpi/ic_menu_add.png create mode 100644 res/drawable-mdpi/ic_menu_close_clear_cancel.png diff --git a/res/drawable-hdpi/ic_menu_add.png b/res/drawable-hdpi/ic_menu_add.png new file mode 100644 index 0000000000000000000000000000000000000000..44acda26134628f779762e4f7369b5df26069266 GIT binary patch literal 2607 zcmV+~3efe5P)BAsI5sU}@Ey zUsYGv@7&+-_r2eH?s;7pmvI@FaT%AtZIL5;T*v&CG8Rx|gnNG#Kng@G0Oy#aq)kKs z-L1Q{GXg~9$mu^cDN^DA0PeOwPSk4MS5?&hPimA$B!9cH;6+zijg8rRLF~tmovh2egJ$`IO9dpDwL!Up{ZgwaiP~7IGK_ zL6iz5kv{fP4CXh-F1`Hs@9z3WYD4L}`ZTAH9Uw*6z)Aero-8Mr+upzZI_5VskrZeJ zPUS7CiV{Hv=%N>Sbjm%qbv`3o;^pCa-isc>=MIUX9$NXSz1Va&-*|oh=NohFK4Vo3 z4#8jsU!z1Kkw669A9lLleA8E#eluTqGX8VeOUu|W^a@jX*j^@&AN$a^?fj!@@!~8F zi!Jjr2nVzRDo`S#zT53YmtXVQ)4P5UuZ)}c$0G-{ih2CfULcRocw||oV@k|mO@hNB z75f>!z)D2%cuHt2@R}J|b@jrtU+>g&!dg0x4AAeG%ft3m^QQ^RmN%X`C8oql70!_B ztM}AZrUIT4LHqSpQ+#sag2uhu!pGxE&KmKHW@K|dlT+o_=6}-}cx6V14haVA;8%eo^nXIrMHrIVY7fcChlhlDJ zhX*UEBtZbB!~g-UVa_2SS)CHLU-A8oUte;8%at}0N8mw5-tJe~`@`+?H$6Bt*D8rg zu=TG}k;d+S_*U*k;~@CnIlDjA*Q|BBI}#Yc$KAZX?}W>4eCjN-GLE$UM_?!bzl%RV z<|qF#p{XrcQ_D{EYijqeI{zlM59qJ15%BP;AV9455c3h`Tcgx2| z&yb>AE7AP0!_8>{F%^3#yS=Kfi3B`n@UmBwSN+*|Lfx3^KQM^2;^uyDR+P3uprc^O zaEdiy`zIPSU9p{5fia9BARq|+Kp+x_F&Qg>EE%%8d4bUztQ^jgoh&r!yao}K+D~Zo z-g_Us_dW#gqf!K*ph_u}dFVO_eGWi3QW$sd8rkXbvhrc(ScG8?fa$45Yd{@)Nz5(-Q?ON#nLz=J~Vi z!S=p8n7_Qq6vHjYxx^?^rCfbT%#w?~TtD_oxgmTJxZW?4D{rsYJ#c%xNj-@oD2Tyk z3daeb7a1Kx%3_n|i<2#=RvuPF3&c&gxQ|Ro3O(NAwM*9r3Ex0~?;*O_9d9Oz6Gxj1 zxs`kNY%Y-2I2dwKEBn)7)nzP z-G*Z1D_w#bAy&DN0zEVEm+TxC^0l&LB7Xglq8D~dPiT^g1)``CTvvgw=qQ&=xJ3)C^r6RqlJ~jo#Qghjjw>u4PO;*zKF^$E2Lq}jM}{D_ z#s=wYe@W#-aa5jKfcxVv`=J+fA2sm{Aft`Gsd^O~d^WF4LlCB+Pw2sN!x3WHvvO>gS!3(68^MTm&N*kDbH*AcM#u_4Rs^xe8C%vmXPgnK z4YXp_b<(>@46$ywq7(erl30XbB$ml}0IQd^bv3!YL6b`ct z5?I8~$Rr19J5KmKI$U!`3m z*6$J?X@vt6oPm;h?=_Ykp*WWuU~MHfn1#18;>e-=(*0E{n_0q^1+hNwXzi@N+HT&2f z)W};rsY=Y*X4>wVd&l(MFU0qTJ{rcZ>A90htafK8*~c#4`Ja1d@1uxTd*)Kpu+mC~ zM22RXpKkx!{9lxcYhAFv}bcY_-~r0!g3BB&M1!-@-!m6pSz?(FnA_(cJxgjI4ZP002ovPDHLkV1ibDD#-u< literal 0 HcmV?d00001 diff --git a/res/drawable-hdpi/ic_menu_close_clear_cancel.png b/res/drawable-hdpi/ic_menu_close_clear_cancel.png new file mode 100644 index 0000000000000000000000000000000000000000..193deda87de0c7f4cf8bff9c264c55e94513f954 GIT binary patch literal 3209 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 literal 0 HcmV?d00001 diff --git a/res/drawable-mdpi/ic_menu_close_clear_cancel.png b/res/drawable-mdpi/ic_menu_close_clear_cancel.png new file mode 100644 index 0000000000000000000000000000000000000000..9e1233eb7fe9674a9771fb124defde76cfa90ae4 GIT binary patch literal 1997 zcmV;;2Qv7HP)FB>HKk)L%)W|UCBY10YmeFMn7RBpF%BOk;W+XKRQNN z(3+HdWF-B>2O2fv;BM%3uxfytOAKqh6qm1vDN3rea#Bi)P$?xV&r0hRF)sI#VXe7D zjnch{z5}Mm>lzLl9=d7l$0Q}7C_xm@B}!5pi4$T{R()eXy2E0q8Rz0!3Vkp~qJ#y)}Pt;pW2J{Joi{SCJ?t$EAdl3`nGS&{+5e-@vIX&skQb zO8+P9l*)`!3_2>tLH_al-BbV4&|U>Yd%rCDr}pEytDqhgvlyW5WSC%xe!&R zTReo3%}!b;FERRyT zH#adq9`bX4sL(eT!OJ&*xVfl8f1}_LYBx(JzKH?}G@{JZpjBD&%01SEkhX<@92Fx7 zh)8kidO5xeZ!gfz)KlH(UBwEntGMp-deY6<3Z{U+ULKbs=um{BVnA+NKmz_={sd;g z+YgwY4AZa#6GtdN0{ls6aUBNq}3@UHC%2AKs!1A`v&0p=G6$h6dhAyVis7T2tH zk{_G1PlBR`IkbAQSoQV@rlkQyz$0bAi3h z)xKJFzn%PO^`P%wlpZ{_Q`LRlD{pfbm{HTQrABzM>3NL|Oq2Q6LGKYNtRz+fsDbQR4>e`C|Hjfzpp_UUwX4j{Y=Iq%LO{J#jje+5>jjB)m`0bEvRlPc@#u1x66y5<27GmSz2ue@ zyi0V;-doBSSlwx}^W!UowFBhLE+`i^ud2uICfy^6}%He8$P45!^V5Z)2M)4itfZ(-GRsYLj?O-<{7gHiovZxp?9+49NM_k4 zsR&EPL7@lJh3EMwr?NcvUJ=1NOdbwBvXd!eAq$ydR?&=g(MnCwR_X+~RkX;8#{!g{ zLXRd7tC8^+-Hd{;Fvc-`Xn5U8J+cYwK~;-vk*p$!C52j5lh`9WX?Q(-NR0~a_TrlW zcu^CZ^rMH}(k0O(ndm2q)^5o{eu_;lYSf5bUVy)3btq%m$vAT&x`ac7E>V}%mFdcK zi`}B~+a+B>tB0aXGbdOMU5ChBi!ze)Ty^&PK65&r4u9>z#oeyXE7WlAeH~BFoK~*y z)!aO{i?RQyTw^ELCu}k|t2YbN$8OYLvy4T@qSq`p>eI(I3sujg@ClIDe%`;F0E@CT z7Zcoh7mr(r3283M0_+#bhH@Kax43a(Sm+m8_!hn&wQ=EA_D|pj`_<$-w#+_dv(Qgb f`;PrCza9B6gjK@0bvXub00000NkvXXu0mjfkT1b~ literal 0 HcmV?d00001 diff --git a/src/org/kreed/vanilla/FullPlaybackActivity.java b/src/org/kreed/vanilla/FullPlaybackActivity.java index 2eea7ecb..23cb1436 100644 --- a/src/org/kreed/vanilla/FullPlaybackActivity.java +++ b/src/org/kreed/vanilla/FullPlaybackActivity.java @@ -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 diff --git a/src/org/kreed/vanilla/PlaybackActivity.java b/src/org/kreed/vanilla/PlaybackActivity.java index 26f87591..12d781ae 100644 --- a/src/org/kreed/vanilla/PlaybackActivity.java +++ b/src/org/kreed/vanilla/PlaybackActivity.java @@ -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() {