From bae9bd00a32c3189b0ed3af522bbf4ad21f1b4e5 Mon Sep 17 00:00:00 2001
From: Wilhelm Fitzpatrick <rafial@cyngn.com>
Date: Thu, 16 Oct 2014 22:49:50 -0700
Subject: [PATCH] Eleven: redlines for Now Playing screen

Change-Id: Iad45c6ebb4f4c541a18d4914c23caae4fa8f4ed4
---
 AndroidManifest.xml                                |   2 +-
 res/drawable-hdpi/btn_add_to_playlist.png          | Bin 221 -> 265 bytes
 res/drawable-hdpi/btn_playback_browse.png          | Bin 0 -> 457 bytes
 res/drawable-hdpi/ic_action_search.png             | Bin 552 -> 16024 bytes
 res/drawable-mdpi/btn_add_to_playlist.png          | Bin 172 -> 185 bytes
 res/drawable-mdpi/btn_playback_browse.png          | Bin 0 -> 374 bytes
 res/drawable-mdpi/ic_action_search.png             | Bin 434 -> 15801 bytes
 res/drawable-xhdpi/btn_add_to_playlist.png         | Bin 207 -> 199 bytes
 res/drawable-xhdpi/btn_playback_browse.png         | Bin 0 -> 630 bytes
 res/drawable-xhdpi/ic_action_search.png            | Bin 727 -> 16189 bytes
 res/drawable-xxhdpi/btn_add_to_playlist.png        | Bin 247 -> 265 bytes
 res/drawable-xxhdpi/btn_playback_browse.png        | Bin 0 -> 927 bytes
 res/drawable-xxhdpi/ic_action_search.png           | Bin 1065 -> 16580 bytes
 res/drawable/now_playing_progress.xml              |  12 +
 res/drawable/now_playing_progress_background.xml   |  12 +
 res/layout/activity_base.xml                       |   4 -
 res/layout/activity_player_fragment.xml            | 361 ++++++++++++---------
 res/layout/audio_player_header_bar.xml             |  86 +++++
 res/values/colors.xml                              |   2 +
 res/values/dimens.xml                              |  28 +-
 res/values/strings.xml                             |   2 +
 src/com/cyngn/eleven/ui/HeaderBar.java             |   2 +-
 .../eleven/ui/activities/SlidingPanelActivity.java |  14 +-
 .../eleven/ui/fragments/AudioPlayerFragment.java   | 106 +++---
 .../cyngn/eleven/widgets/AudioActivityButton.java  |  18 +
 src/com/cyngn/eleven/widgets/AudioButton.java      |  39 +++
 src/com/cyngn/eleven/widgets/BrowseButton.java     |  19 ++
 .../eleven/widgets/PlayPauseProgressButton.java    |   4 +-
 src/com/cyngn/eleven/widgets/QueueButton.java      |  19 ++
 src/com/cyngn/eleven/widgets/RepeatButton.java     |  43 +--
 .../cyngn/eleven/widgets/RepeatingImageButton.java |  11 +-
 src/com/cyngn/eleven/widgets/ShuffleButton.java    |  45 +--
 32 files changed, 508 insertions(+), 321 deletions(-)
 create mode 100644 res/drawable-hdpi/btn_playback_browse.png
 create mode 100644 res/drawable-mdpi/btn_playback_browse.png
 create mode 100644 res/drawable-xhdpi/btn_playback_browse.png
 create mode 100644 res/drawable-xxhdpi/btn_playback_browse.png
 create mode 100644 res/drawable/now_playing_progress.xml
 create mode 100644 res/drawable/now_playing_progress_background.xml
 create mode 100644 res/layout/audio_player_header_bar.xml
 create mode 100644 src/com/cyngn/eleven/widgets/AudioActivityButton.java
 create mode 100644 src/com/cyngn/eleven/widgets/AudioButton.java
 create mode 100644 src/com/cyngn/eleven/widgets/BrowseButton.java
 create mode 100644 src/com/cyngn/eleven/widgets/QueueButton.java

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index bfb1fef..7878448 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -20,7 +20,7 @@
 
     <!-- ICS to Jelly Bean -->
     <uses-sdk
-        android:minSdkVersion="16"
+        android:minSdkVersion="17"
         android:targetSdkVersion="20" />
 
     <!-- Used for caching and creating new playlists -->
diff --git a/res/drawable-hdpi/btn_add_to_playlist.png b/res/drawable-hdpi/btn_add_to_playlist.png
index 604f123bedd05209b4107d31c9ac9941a4b0f041..4eefbf766bf8cd7a0f4994e09440885f7d6f87b1 100644
GIT binary patch
delta 235
zcmcc1*vX{W8Q|y6%O%Cdz`(%k>ERLtq;)}<gAGVpNj;i1(M+R$wWo_?NX4x;*B^2=
zC<wGA_PS-Tm7kEEwM{mwJ*|M<`r!OBG0~Jg?1B;M{slD==~8R>OfoJkaBODNy=uQR
zvZrv$Y<-)kHCtb+UkqxFS+`-I;bov?p3d@OKK@hM?=oVm)R*eVocy@j@~!BMl{G!r
zrWe(uE_0kL_dIK*Ox+yEqJ&Go4rRZH(s>%8y=ZB9+A^TYe;4onIA{CqyE6Y$!KShC
fN|mgNZD3^Jw3SOs+q1D4=za!IS3j3^P6<r_L2_NY

delta 190
zcmeBVy31(R8Q|y6%O%Cdz`(%k>ERLtq$Pk@mxB#RZaJ{}8Ia;E@Q5sCU=WxC!i;KX
ztxP5=YSd?Wx;TbZ+)DcO|Gz!6uAwk<@4*$Ui^Y1P3}kc?6oc;8$vo;?TxgKRSUV|`
ziS^gVmwOowDR4j1+|V%L9{1vjHWon_ow$^W6&pj29N@^R?VYv^s5#AK(E+EZ=nV-b
kliYPBwk8NfGYBLwT*?mFEft%61Lzh8Pgg&ebxsLQ0CEUF?*IS*

diff --git a/res/drawable-hdpi/btn_playback_browse.png b/res/drawable-hdpi/btn_playback_browse.png
new file mode 100644
index 0000000000000000000000000000000000000000..1487c5df337d729b97b7750ad593f54f34f05ccf
GIT binary patch
literal 457
zcmV;)0XF`LP)<h;3K|Lk000e1NJLTq001oj001or1^@s6IvV1d0004yNkl<ZSi|ku
zziSjh7>DuC$(3RZiUvh}!BVu)!e0<<Bx0+CG!{03kkZoL#?Hb&Kx`B{qoguLY{bsW
z6!Jm}8wE|kPGhqX5xu({yL&6l1Jmrz%svd?eP?zl6bgkxp=NrMe0XLa#}!<{xrjJ2
z%D8^Zk~3JSM9*UHIP>%ymfVMnxLV0h)iH0s0nvF}uG+CC7NcL2=y^QAnKoj!tEPFb
zw<TO>JbsKZ<~^1$jhmf$5&vKvPb<;45wTH4>rR)d$0w}fIi5tsX4m4e%?1{+5)tcN
z&-Aa=jfhA8OZ8}#B3-15bp3qq)X{Xn0qa_IT%E!GPD^LzX}rRoPMxO*2w%YKiSLM+
zc>uesHjKv;-NrNXE^gz{i2bK<bV#>1jYwx^5ASedC*vaGYi54L;eT}5!i}a%-u;~l
z|Hdr7{N?&f9E^yyrs8pH-2W&M@d4ABIfs+@jAz>)15IXnYsmc<BSd8x%Wdw6_XgZs
ziipKF%4ctk%CS&Yj#K!C6+DcHRfR&KP$=LhOx<7YqY{w%00000NkvXXu0mjf%Lv&i

literal 0
HcmV?d00001

diff --git a/res/drawable-hdpi/ic_action_search.png b/res/drawable-hdpi/ic_action_search.png
index a12393e9d45b9bc8f38b7cde3059779a5c1f237f..8ed13dc2aed6a8c1cef9e7522884f3d2a9254d01 100644
GIT binary patch
literal 16024
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
bJE=rP>HI_KeG{4Tv*ShUifyOzE1LcZnUKnv

delta 506
zcmV<W0R{e;eW(PGIDY^cbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz
zwMj%lRCwC#nbD2IAPhh+UEs1o+29x<8#E(i1V+dR9pN^(jF8(PBXAqg334F0KUM62
zW0F+DlGTa?cm*5Vw3_Gn<K3hx&;`0czdv;AReNn-+O5~g>wf^>WhFo-YVEc6>gG5Z
zy*7+_P)+U7CcrMi*Ly>E^L7b8SnmZb0W1a{<A}l8eu(Ff1&0gHc_aG#!8<O8BL*9^
z#EKcBuktz&D}K*q9z8PQl(5B=X{j90PRJ&W<Z4q78)PEG+}3enEGrG&Bdg5y`c}$B
zE`*OZ3vI)O;D3wtRjC7A65rpNNBl-EjwtjgWN&CCv3r+9Q_vfMueqV8g|-{VaX`9+
zdDvlGAxG4}%)uQJS;Zsbh=6wjfrT?p6m&!64JLAhF<_fBpB`7Lk(ODKnVk7_4Icg(
z892iGUlH!~fWVUMh_TgpIO@g-@Kj-er(7Xu$RDnUgL5;Et~;YHv|z(dqHg4-nF`?T
z3heZ9tZ4~wiEA+p&iBmL9BlQ36t0wiM48G_cX^w@kGz0f1Fz3|Yf6DvXTIviz)ua0
wfuA1wStJ<v{HBWN^7lo7F3<&<C;tKr0Fi?)iZA=2kN^Mx07*qoM6N<$f(9S%3IG5A

diff --git a/res/drawable-mdpi/btn_add_to_playlist.png b/res/drawable-mdpi/btn_add_to_playlist.png
index 61df825eaa86a5be815fe540946f6acd0db8a46d..cbd99df04dfca3bdc273dc37da859e9df4159a9e 100644
GIT binary patch
delta 154
zcmZ3(xRX(_Gr-TCmrII^fq{Y7)59eQNXvmR2OE&IHdwc4qM1fPw5N+>NX4zB1PRu~
z2_gZU29p-Q{Qv*|K8-d5qdc{%JYq(&Z<>#(-%MK8$n`3)o85g?+p;)$qqFy#^tbjO
z`?x@VXWF8vF)tT8+GZJU&04OzShp+CfQyZnfy017;RWB-b-%S*fYvd1y85}Sb4q9e
E0L~OP5C8xG

delta 141
zcmdnVxQ5ZJGr-TCmrII^fq{Y7)59eQNDBb590wbaRQ)+m5J+(rctjR6FmMZlFeAgP
zIT8~UHT*0+T^vIyZYBNs|KFZjwW07z!^6A-bte0i&0KwWM4A#47&HXF2QRo^IHToY
nhLhBpjRsi<CKxg(9AMb_&Eo6s|JxLRMl*Q2`njxgN@xNA0F*2)

diff --git a/res/drawable-mdpi/btn_playback_browse.png b/res/drawable-mdpi/btn_playback_browse.png
new file mode 100644
index 0000000000000000000000000000000000000000..eb878530c083918df7e8a3ca1b79f705bb0eabed
GIT binary patch
literal 374
zcmV-+0g3*JP)<h;3K|Lk000e1NJLTq0015U0015c1^@s6J20-I0003!Nkl<ZNXPBg
zKT8}@6o=u*b!{RT3zZNpjs%fZc76uUu3!_zCbeI|-qJQ;VQ(Q;u@VV_poOiia6!;k
zQ4ykInp+Jkadw9&vOk#S%$f7vGv^PNuDW_}>ZvMFN@)Nim_!4!5i$Opf4xK4V1_K>
zD?a1HOTMj_1odMKKQin~yN52D@fwz^C{0=L&@=W2+~FKsn8I9@;G&MPgCm?o#6>R2
zdes^C;2urvN5r3Yr==b6bwuoTTH{(t|EH>Ezvh+nYT$a6!BR>S7{#am0!}IQVH-2K
z2WnM=Yq`OS+W6PPC=E_2HL;q1;YVB*-uLF+UDRpY&6QI6j$e5N4xz8;6A_QtFPP7;
z)JeuaTiAMA*uG&N)A)^ph`8(oe2d{0^(<z6ht2#{GRF<<;Rc6Tz)JVx*43NVUyL$B
U)uP=$g8%>k07*qoM6N<$g3~dq8~^|S

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi/ic_action_search.png b/res/drawable-mdpi/ic_action_search.png
index a920e5088f7dbfaf4f5259dc3e0589e0f4e65af4..a0b7b564f2bf411ce1b9fb1d3a9f0ac47ffe7033 100644
GIT binary patch
literal 15801
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

delta 387
zcmV-}0et?sd$I$NIDY^cbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz
zKS@MERCwC#SJ4f^AP{X`Kt^DMZeT}ngpSY=>IRO`5p;u&fE(ZjbOJn*GeJDzK&yWA
zl9!a0@WSIBcdf0p)h}XG{U}!Azawq|BVYo!Y&7_M1jr(0mw(j}G=RybV+4rAS`SE(
z8p{s_kX+*Wg^wGQavQwA0<<?L{C>e>F{M(6@@ha!%<BkMhEl0pf>b1q#1F$cZz`)h
zVjPoB0S?~S$-ghLlMK#uVwhu$tidMUdC!{ZN=^7an|S`f#bio|RbVSl$jBN+#4b^K
z2Jw(fOr^Rc?0nHgtkDtnE50&Ef_w=4DT#S5`ge#0-n}J}QYcv@79~$fB2eO3mC`7$
z$sw<qU8cZmP<quzAx@EsHsgGi+X&>M;qLs?J(t2A&Z(lYM6*Ycf33^Blb^9Gd8%;r
h`U|rXFBLZd1^{vFA9gZ?Ey4f*002ovPDHLkV1jWwt?B>(

diff --git a/res/drawable-xhdpi/btn_add_to_playlist.png b/res/drawable-xhdpi/btn_add_to_playlist.png
index 63b3da88e678ae228b7002297da23197d46db0f7..7c3a5ab6e449f3b1d98d7339b5e51d22a9703a80 100644
GIT binary patch
delta 168
zcmX@lc$`tOGr-TCmrII^fq{Y7)59eQNZWug2OE&I`g5~rqM1frrl*TzNX4x;H!kuv
zDDXHOyp}q%GxIguhlLY5%DFFyduH?i6*ruSWe*LN=bLo1>`dX`x7^%fIuRQZ4mPpY
zCvTmzw)=Ej-G;VZmzr3C;y<R8|2S)YTVD<+3sDBtZ*f5P07GF7k5%{Agf<|b!PC{x
JWt~$(69DoQJv0CS

delta 176
zcmX@kc%IR$Gr-TCmrII^fq{Y7)59eQNGkxb4F?;LWY60n0;D(#JR*x37{pXTn9(yx
z<-<fpjlvjD7srr_TW_vk<UF9j!|D*cYsO^js5fj)_JLJDc^@5Q7FITnPPJXT184#W
z-0L+?zW81V$lAdraQ}RU$lbfH3=9QltP_-(fPx0xE+AD5AMy`~BrqIL;m?-8Gxaw}
N#M9N!Wt~$(69AazF~a}=

diff --git a/res/drawable-xhdpi/btn_playback_browse.png b/res/drawable-xhdpi/btn_playback_browse.png
new file mode 100644
index 0000000000000000000000000000000000000000..c8bb9d427c5125bf62d8107f46ee42e136bf858b
GIT binary patch
literal 630
zcmV-+0*U>JP)<h;3K|Lk000e1NJLTq002Ay002A)1^@s6I{evk0006#Nkl<ZXx{DF
z&x?&w7{Kw*%v@$nX(nUAVtD+Pq9~>*KS~x9OOj+`K}it{e}R;+lah_i*eS_IA&bdM
z7NbTf$1If0l#r%I!{WZmg1R$v@7&kze0T5LdC$4ud(L^zInN=J$z(E_OeT}53vFfp
zfhna0Sd4zG!7=nl#K3IotCU!D5B6gK>(Pg<xz<}LiCh;}VgpX%Ale(zR;7uOt1yTo
z*jDslcca^_%#&OP)?p(KU^mt_;}5SiSadrsU>ADlqX(NNTm+qGWebMw4XnGfjM2Ze
z%TmD?jNvuj;Zm7<c(zR71`ZX0Zbw8M#ZasC@EBfU822LLeIs{;%@F=p2tLGJe8yx%
z{A{H;Jb~+Yj?su1Z}p({CL%7k`m$6?vTzp8!dW;AXW@KWs`*UarkdyK#FCa2E+o5g
z6Nj;|I5<qVoN!919oKNKQPZzdBH1oH#?JpWXid$q{P{-9)~$z&q1b~hs@EZlR1@p9
ze&2yJGidTh(}Yt>y||;AitU@_s99coTPwGlBAim%ikEd5Bp>kst7|NKW!~p-N@)e2
z)MH9S#1t+TkAF+`{C@WW`yyhj8A0o;>TQBLN#Dm_jAQZ-(eL<#QxP#35hKkCTBqwB
zK_lX6N@*E36+5eGj7P+18KQK@49Y&5f%G&+G>Ewj>033H8^P7GY;b0s+)gPiErQnO
ze-!zO2N7|+OxxEvW%E-?J;nNaLiKXHqMBqM!f-^qmC0l>nM@{=$z)oBU-uq?auRA#
Q{r~^~07*qoM6N<$f;o*T2mk;8

literal 0
HcmV?d00001

diff --git a/res/drawable-xhdpi/ic_action_search.png b/res/drawable-xhdpi/ic_action_search.png
index c631b1deb885eeae87408f110fd233c98f11dd5d..6d50c315d40bd2b754f861a7267e9f813fd2e980 100644
GIT binary patch
literal 16189
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
b+Z4!7$KtxS48H|zCZr&5xutpWhVB0Xv6Ky<

delta 683
zcmV;c0#yCIe%A$%IDY^cbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!
zWJyFpRCwC#n$c~8Kn#YHs_$Wg+z4zCx<NMRWrK{6PS9q8G6LOz5$Fb&4afxakQ@m`
z1sl%3gXAn(m73JLk30O^zOI|5Sv`}zte(swa0HIP5jX<R*?(Sz;-=O!>k0h4nE|h?
zm)2|V#BJfh<jQ((y>94MS=WqfK%EoR#f&d-*8s<nJBnEe4^Rwv?NCeS*53u*vMapz
z)ts`l6l`l7NN9VB;8S*35>|Yt#{wU%e-gj@W4!<w>RJn-t#1i2E+BDr2w76Z1odS-
zA;ildJ5%BX$$!$A^wa<`CT2pEH02vu5nxk?g<#ORZ(wXe8N*^qAG=JIr6GwpgN(SE
zhRi%=4Xiqxf;RTqi79^?ki0(2d;w>O^l)}Ovj9#8J}a1ujS954uL29c!$zROGLpL-
zM?4W&=GaOccQ3%)EnJ%*ccFnRkHACmetjM3p(<+2rGJl|YHP|mSb=Ng>E?)5kAdAu
z15=A`E!@qdNUv=|^utC7IwcGibO>NgXw-|5ZJZ{+nviqpk^o)9SVkeBC2>}L3OScn
zAXC&r{?fTmQt-Rogj91tIw{dHZ3-E4v+`>!&{JyZ3bgm?8TcE~Y0>8427Or?v`e>C
z!SOyb!GE+5??W7#Df^`kSElz@rJDG6x(ReYd_TWFf*#k%MR+S+dk4**1nqKNO112+
zy`#2x8jde-_V)Sj1{0ipr{@mL4(;PebM?uT<Nb!UkxLok<?yb$3=kGKwWL6+M;p^(
z(8Z$xccHKU4Ea!bT1wLD8|m&r=X2`JYstXgn<R$_9DyTn1dhNFnA!dW7y!tT>}_UK
R&dmS-002ovPDHLkV1jHOL`VPt

diff --git a/res/drawable-xxhdpi/btn_add_to_playlist.png b/res/drawable-xxhdpi/btn_add_to_playlist.png
index ed398495048b2f7f476df8af38842a334fa2f7d9..8290f78a597bd9f8bab8cb1e747eff35d894c54e 100644
GIT binary patch
delta 235
zcmey)*vX{W8Q|y6%O%Cdz`(%k>ERLtq@zHXgAGVptZ-zSXr@uW+SA1`q~g|_+ZzQN
z6a*L??`^bMb9mMo=U<19uyGW`-R<Rl!oqX~q!$DpXe)g_`}N-Tg$G^cL>}LyHlL&P
z!>=t1#k-?2779Xei&#`fi<s2H)_>bG+5dlESX&#}Z}$3Wqh#)D0idW@6w|_1w~U3Y
z&jfGU7uh(ru?cUSeQ_HfSPMuSNDhbvt(Ly|-(=p;0kN22(@qu%hHI_-f~t?c>Vw2Q
MUHx3vIVCg!02e@55C8xG

literal 247
zcmeAS@N?(olHy`uVBq!ia0vp^20$Fe!3HG%<zC$lq&N#aB8wRq6fHoQ(RG?(0#H!0
z#5JNMI6tkVJh3R1!7(L2DOJHUH!(dmC^a#qvhZZ84Ny^wr;B4q#jQ6t4stRm@~}AA
zt~1o$zGZ7$bAix|TJIAA^0Q{9l$<l3#ST=93?BI1I~4W%@y}EyxaeNv$#2?f^}{(J
yA`4#VhJ>EZ5`@b$Fg&={e})B#4`kMz5lmn>Ud_L}h(kCJB<1Pq=d#Wzp$PynQ9xh-

diff --git a/res/drawable-xxhdpi/btn_playback_browse.png b/res/drawable-xxhdpi/btn_playback_browse.png
new file mode 100644
index 0000000000000000000000000000000000000000..96b37c8b4d259de5479406a072e5b4582c7fe1db
GIT binary patch
literal 927
zcmV;Q17Q4#P)<h;3K|Lk000e1NJLTq003G5003GD1^@s6IH*Aa000AKNkl<Zc-rmU
zO^8)x7{Kx0%$yoE9W5fGg+5atm6#NLhXv8XAd4)J7PgBPK}4IN7D2QrXx-4JMT>$W
zHT$9#VMY;c3i@7*2M0nIk|5cPI@#jBi&+Gk_v@TH&mZpQaz5Vszvn#f^PKxWmn2D&
zBuSDaNs=T<k|arzBuPewvE}-~>$)Dp3QS@e58`3WMZ}I?pRZbGa;qYB8k=!<d0n<-
zv#tF&ceM=UuESl}h8vcMo*d*jsu7htjYqK)n@WgSf$?FDscN~<i6U?nZpK5{g>_9E
zYt=%zQ`m@Wa1-vq9k{5;<E~mFcVmgMcjEdYI@)xBR1KDUdx^6<u)a)QlWk2&s|Ja^
z9QWf9Jb;N&nxLzONM3`3xOP<2%<+bdW92AIZj$J;qh2_TTYfC!B#vP}<}<zP9rKvQ
zA^d<Z@J&SgRoC^AQuL(g3*;ES!~y(NB+o{~*<sw(qbB+nyoV3*D^6qnKjdb?a-N*Q
z0{$*n?FZNw5yvx+?w%7R&d%aHd=(J~vta2Bhf5)I0Kel<L>$h_u(#~ddE_|}5%XG3
zlSMB?#OX4jWx<l9=oFozlN6nzlN6nzQ*@G|Q*@G|Q*@&k$geNUZ6W$5Y{A;{)+{bg
z(Y=wo8qZ?4&KkaI$(_8Yvv?;(cOiHUp215^7|*D#_}`4zb(Z={(fyIU1^aaRR5I)6
zljN06l-wlIy-Km3$A%_e1l16(y7fA(5m#Wf&I<mC9vt^l+}DF+{nKjEbzN^ODc05{
zqI=mUu>n{0;5gs6QgrE}dI$IFZxiKsk3!*#t&7ohUEhW|o!*pwcd8yOuWoo3pSMbM
zUDvl_FQx_&nj+#4eAdMwKEl%xvCtaPCC!?_l>?q@U&j0YbDu@LfZY*sq;2WlPTV-?
zj3y#Z;xRmTp4r2jxEilS#Gh?U@17b~z8Vpy@M>MxGk5~qab1}sj^jssg0~~$#GuAC
z)~C>MO833lZ$-r8qf)gtwFEzduSe<eK)*zP+vWbhMZ`>sJ~yv*vG1G)J>G1(=>2%(
z0>Z@}+|ut1U>Nl6FB$5(UWF%1NxSwOn}1rqn2-BaFpR9|B6|Xt=={~$_L5sq>9nr>
ztkc1|7e`ADoFqw-BuSDaNs=T<k|arzBuUbI{so`6%4oQ4-1Pte002ovPDHLkV1j48
B%ToXV

literal 0
HcmV?d00001

diff --git a/res/drawable-xxhdpi/ic_action_search.png b/res/drawable-xxhdpi/ic_action_search.png
index be447dc929e792bff75a435af0944e643e2498d7..6c518ca7cf1a5cdc0a944dae8512736ed3d398bc 100644
GIT binary patch
literal 16580
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
NBO*$BWNPB;{{W7S(cu69

delta 1024
zcmV+b1poWQfdQ!qkT`z;8FWQhbW?9;ba!ELWdK2BZ(?O2No`?gWm08fWO;GPWjp`?
z1GY&-K~#9!?40d!+b|4<l`bG|V08kk6GWY$*`Ue<bvJM~a3-iSK|O*pL6iw1Z(vWL
zl6TNmmvd5qA0TbLxWoC6WfG5IkRU<c48xE?!pjXn12jNG02+Uw0UDqI8lWKn4bT7$
z&`SedYE_fZskCoC0h$T6rq5f(b1zyut$R{{J|o6cHw1X);rC7id#kkv=zoBX=7HLH
zOc}TY=nVnLg=~7D_Kr&dt>|xk8^NxF);o&jR}H!($g9Zq-D_>G6?93{usjiGN&>cT
z(5XQl<)_x&wSa$46><`u?F+P`fyYNoetPF6`gnm~V`Z1VK(`LFivtau&3|SIh1QCu
zi))7jr-(B3GoT%HGuTP5wYF@t(%M?KyZ2x-TU~!ZX+2sPyQ61a+pjI#uPzPrmTBP8
z!HeJ1QftTTM=K55B}OY+SI8Ohu?m!}DH<o%$qtNy-dukN_L_njM%qj9=$<j1d!X4u
zXff*>e;D8YEVkO`5EnVK3nl114Wn<H)Ca>|LLuW^2$?Hg>Y-z9f^wh)L0U}m^L=j8
zCefi!me0-20%PszaoVj?1zj>dD;DTe0DDA1E5>(Y?r?Mg>`Bt2pCT`d&P_(DYw&1@
z<6sB@Xn=nP=s<%^8QHedvpvarbRH=yOyxz3dGxrN7DLPnUR{Gnzs&qz9SJmNNw!NF
z^xV#^r4oWS^ZdCl*erS-QwGghwAn`R<~)EMPU5n|a%31JRV7r=zin>6zDR`*7tjXW
z+%?~j8?)1p(Pr~EXl2*Rg?2K=-3*n;7MA$VkF<Yr9lao*MktGZ^p{lEF~-DK<})Xn
zU$>rO@;>9&;>lN*dU#vA!A=?n?^aY-Vp9$#UZvzCbc{y#gS|A2TDZaiaMU74UuC;y
zUE$gBH%>GwX(vfhISCO}=I>0*qjc8lv*O=${PzW|T#CZ>eTD_Fg+K$gAZWlA1f9{~
zwa<UjJ*6cIJM>v_MTx;TL11RBytiyK9BiR^q|4zR+rvkV!@NGpgoUGb0f2vWx+@vj
zS&S@+GQ5q&A)hJS9Tmj;Uib<EJB2%y#(R{;yOhpteRZ_a&{F*E1FoG1iP=lKB`hlJ
zrCrAs4fYc6y^8{SsTT~2!(Q@Dj<&F^&P;eN{mM*R*zAL#OE254DI9QxT~mnqXgk;n
zpk-il6DC}1Y#FoJF&d!xuzzJ1g_{6<Ud$bNKYT$3=#QnK*~NI%PMbO0?E%n20?+^r
u&=7zIXn+Q2fCgv?Km#;D1GI?z6<`2RGf=Z;PjEN@0000<MNUMnLSTYsHQlBF

diff --git a/res/drawable/now_playing_progress.xml b/res/drawable/now_playing_progress.xml
new file mode 100644
index 0000000..a0f1d2e
--- /dev/null
+++ b/res/drawable/now_playing_progress.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2014 Cyanogen, Inc.
+-->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:innerRadiusRatio="2.601"
+    android:thicknessRatio="8.666"
+    android:shape="ring">
+    <solid android:color="@color/circular_progress_bar" />
+</shape>
diff --git a/res/drawable/now_playing_progress_background.xml b/res/drawable/now_playing_progress_background.xml
new file mode 100644
index 0000000..2aae94c
--- /dev/null
+++ b/res/drawable/now_playing_progress_background.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2014 Cyanogen, Inc.
+-->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:innerRadiusRatio="2.601"
+    android:thicknessRatio="8.666"
+    android:shape="ring">
+    <solid android:color="@color/circular_progress_bar_background" />
+</shape>
diff --git a/res/layout/activity_base.xml b/res/layout/activity_base.xml
index 9513a66..78c913c 100644
--- a/res/layout/activity_base.xml
+++ b/res/layout/activity_base.xml
@@ -67,10 +67,6 @@
 
                     <include layout="@layout/bottom_action_bar" />
 
-                    <include
-                        android:id="@+id/firstHeaderBar"
-                        layout="@layout/header_bar" />
-
                     <fragment
                         android:id="@+id/audioPlayerFragment"
                         class="com.cyngn.eleven.ui.fragments.AudioPlayerFragment"
diff --git a/res/layout/activity_player_fragment.xml b/res/layout/activity_player_fragment.xml
index 692f66f..961c41f 100644
--- a/res/layout/activity_player_fragment.xml
+++ b/res/layout/activity_player_fragment.xml
@@ -1,182 +1,231 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
   Copyright (C) 2012 Andrew Neal
- 
+
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
- 
+
        http://www.apache.org/licenses/LICENSE-2.0
- 
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent" >
+    android:layout_height="match_parent"
+    android:orientation="vertical">
 
-    <LinearLayout
+    <include
+        android:id="@+id/audio_player_header"
+        layout="@layout/audio_player_header_bar" />
+
+    <com.cyngn.eleven.widgets.SquareViewPager
+        android:id="@+id/audio_player_album_art_viewpager"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
+        android:layout_height="match_parent" />
+
+    <RelativeLayout
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent" >
+        <com.cyngn.eleven.widgets.PlayPauseProgressButton
+            xmlns:android="http://schemas.android.com/apk/res/android"
+            android:id="@+id/playPauseProgressButton"
+            android:layout_width="@dimen/audio_player_controls_main_button_width"
+            android:layout_height="@dimen/audio_player_controls_main_button_height"
+            android:layout_centerInParent="true" >
 
-        <RelativeLayout
-            android:id="@+id/album_art_section"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_above="@android:id/progress"
-            android:layout_alignParentLeft="true"
-            android:layout_alignParentRight="true"
-            android:layout_alignParentTop="true" >
-
-            <com.cyngn.eleven.widgets.SquareViewPager
-                android:id="@+id/audio_player_album_art_viewpager"
+            <!-- TODO: Figure out why scaleType: centerInside isn't properly scaling up -->
+            <com.cyngn.eleven.widgets.PlayPauseButton
+                android:id="@+id/action_button_play"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent" />
-
-        </RelativeLayout>
-
-        <!-- This is the add to playlist, track name and menu button -->
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:baselineAligned="false"
-            android:gravity="center_vertical"
-            android:orientation="horizontal"
-            android:paddingBottom="@dimen/audio_player_header_padding_bottom">
-
-            <ImageView
-                android:id="@+id/action_button_add_to_playlist"
-                android:layout_width="@dimen/audio_player_controls_top_button_width"
-                android:layout_height="@dimen/audio_player_controls_top_button_height"
-                android:layout_weight="0"
-                android:scaleType="centerInside"
-                android:src="@drawable/btn_add_to_playlist" />
+                android:layout_height="match_parent"
+                android:layout_gravity="center"
+                android:contentDescription="@string/accessibility_play"
+                android:focusable="true"
+                android:scaleType="centerCrop"
+                android:src="@drawable/btn_playback_play_med" />
+
+            <ProgressBar
+                android:id="@+id/progressBarBackground"
+                style="?android:attr/progressBarStyleHorizontal"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:clickable="false"
+                android:indeterminate="false"
+                android:max="100"
+                android:progress="100"
+                android:progressDrawable="@drawable/now_playing_progress_background" />
+
+            <ProgressBar
+                android:id="@+id/circularProgressBar"
+                style="?android:attr/progressBarStyleHorizontal"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:clickable="false"
+                android:indeterminate="false"
+                android:max="100"
+                android:progressDrawable="@drawable/now_playing_progress" />
+        </com.cyngn.eleven.widgets.PlayPauseProgressButton>
+
+        <!-- TODO: Figure out why scaleType: centerInside isn't properly scaling up -->
+        <!-- ANSWER: two issues (a) centerInside doesn't scale up, only down, use
+             fitCenter instead. Also, ImageButtons come with built-in padding, but
+             that only makes a visible difference when you are scaling the image.
+             so you have to set the padding to zero in order to get the result you expect -->
+        <!-- This is the left side of the progress bar - it has the previous
+        and shuffle button and the current time text -->
+        <RelativeLayout
+            android:layout_width="wrap_content"
+            android:layout_height="fill_parent"
+            android:layout_toLeftOf="@id/playPauseProgressButton">
 
             <TextView
-                android:id="@+id/audio_player_track_name"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:ellipsize="marquee"
-                android:fadingEdge="horizontal"
-                android:gravity="center_horizontal"
-                android:marqueeRepeatLimit="marquee_forever"
-                android:paddingLeft="@dimen/audio_player_track_name_padding_side"
-                android:paddingRight="@dimen/audio_player_track_name_padding_side"
-                android:scrollHorizontally="true"
-                android:singleLine="true"
+                android:id="@+id/audio_player_current_time"
+                android:layout_width="52dp"
+                android:layout_height="@dimen/audio_player_controls_end_button_height"
+                android:gravity="left|center_vertical"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:paddingLeft="@dimen/audio_player_time_text_padding"
                 android:textColor="@color/audio_player_text_color"
-                android:textSize="@dimen/audio_player_track_text_size"
-                android:textStyle="bold" />
-
-            <ImageView
-                android:id="@+id/action_button_menu"
-                android:layout_width="@dimen/audio_player_controls_top_button_width"
-                android:layout_height="@dimen/audio_player_controls_top_button_height"
-                android:layout_weight="0"
-                android:scaleType="centerInside"
-                android:src="@drawable/menu_button_light" />
-        </LinearLayout>
+                android:textSize="@dimen/audio_player_time_text_size"
+                android:textStyle="bold"/>
+
+            <com.cyngn.eleven.widgets.RepeatingImageButton
+                android:id="@+id/action_button_previous"
+                android:layout_width="@dimen/audio_player_controls_end_button_width"
+                android:layout_height="@dimen/audio_player_controls_end_button_height"
+                android:layout_toLeftOf="@id/audio_player_current_time"
+                android:layout_centerVertical="true"
+                android:scaleType="fitCenter"
+                android:src="@drawable/btn_playback_previous" />
+
+            <!-- divider -->
+            <View
+                android:layout_height="@dimen/audio_player_divider_height"
+                android:layout_width="@dimen/audio_player_divider_length"
+                android:layout_marginRight="@dimen/audio_player_divider_horizontal_offset"
+                android:layout_marginBottom="@dimen/audio_player_divider_vertical_offset"
+                android:layout_alignParentRight="true"
+                android:layout_above="@id/audio_player_current_time"
+                android:background="@color/now_playing_divider" />
+
+            <!-- divider -->
+            <View
+                android:layout_height="@dimen/audio_player_divider_height"
+                android:layout_width="@dimen/audio_player_divider_length"
+                android:layout_marginRight="@dimen/audio_player_divider_horizontal_offset"
+                android:layout_marginTop="@dimen/audio_player_divider_vertical_offset"
+                android:layout_alignParentRight="true"
+                android:layout_below="@id/audio_player_current_time"
+                android:background="@color/now_playing_divider" />
+
+            <com.cyngn.eleven.widgets.BrowseButton
+                android:id="@+id/action_button_browse"
+                android:layout_width="@dimen/audio_player_controls_end_button_width"
+                android:layout_height="@dimen/audio_player_controls_end_button_height"
+                android:layout_above="@id/action_button_previous"
+                android:layout_alignLeft="@id/action_button_previous"
+                android:layout_marginLeft="@dimen/audio_player_controls_end_button_half_width"
+                android:layout_marginBottom="@dimen/audio_player_secondary_control_offset"
+                android:contentDescription="@string/accessibility_browse"
+                android:focusable="true"
+                android:scaleType="fitCenter"
+                android:src="@drawable/btn_playback_browse" />
+
+            <com.cyngn.eleven.widgets.ShuffleButton
+                android:id="@+id/action_button_shuffle"
+                android:layout_width="@dimen/audio_player_controls_end_button_width"
+                android:layout_height="@dimen/audio_player_controls_end_button_height"
+                android:layout_below="@id/action_button_previous"
+                android:layout_alignLeft="@id/action_button_previous"
+                android:layout_marginLeft="@dimen/audio_player_controls_end_button_half_width"
+                android:layout_marginTop="@dimen/audio_player_secondary_control_offset"
+                android:contentDescription="@string/accessibility_shuffle"
+                android:scaleType="fitCenter"
+                android:src="@drawable/btn_playback_shuffle_all" />
+        </RelativeLayout>
 
+        <!-- This is the right side of the progress bar - it has the next
+        and repeat button and the total time text -->
         <RelativeLayout
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content">
-            <FrameLayout
-                android:id="@+id/play_pause_container"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerHorizontal="true"
-                android:layout_alignParentTop="true"
-                android:contentDescription="@string/accessibility_play">
-                <include
-                    android:layout_width="@dimen/audio_player_controls_main_button_width"
-                    android:layout_height="@dimen/audio_player_controls_main_button_height"
-                    layout="@layout/play_pause_progress_button"/>
-            </FrameLayout>
+            android:layout_width="wrap_content"
+            android:layout_height="fill_parent"
+            android:layout_toRightOf="@id/playPauseProgressButton">
 
-            <!-- TODO: Figure out why scaleType: centerInside isn't properly scaling up -->
-            <!-- This is the left side of the progress bar - it has the previous
-            and shuffle button and the current time text -->
-            <RelativeLayout
-                android:layout_width="@dimen/audio_player_controls_side_width"
-                android:layout_height="fill_parent"
-                android:layout_toLeftOf="@id/play_pause_container"
-                android:paddingTop="@dimen/audio_player_control_padding_top">
-                <com.cyngn.eleven.widgets.RepeatingImageButton
-                    android:id="@+id/action_button_previous"
-                    android:layout_width="@dimen/audio_player_controls_end_button_width"
-                    android:layout_height="@dimen/audio_player_controls_end_button_height"
-                    android:layout_alignParentTop="true"
-                    android:layout_alignParentLeft="true"
-                    android:scaleType="center"
-                    android:src="@drawable/btn_playback_previous" />
-
-                <TextView
-                    android:id="@+id/audio_player_current_time"
-                    android:layout_width="fill_parent"
-                    android:layout_height="@dimen/audio_player_controls_end_button_height"
-                    android:gravity="center_vertical"
-                    android:layout_toRightOf="@id/action_button_previous"
-                    android:paddingLeft="@dimen/audio_player_time_text_padding"
-                    android:textColor="@color/audio_player_text_color"
-                    android:textSize="@dimen/audio_player_time_text_size"
-                    android:textStyle="bold"/>
-
-                <com.cyngn.eleven.widgets.ShuffleButton
-                    android:id="@+id/action_button_shuffle"
-                    android:layout_width="@dimen/audio_player_controls_end_button_width"
-                    android:layout_height="@dimen/audio_player_controls_end_button_height"
-                    android:layout_below="@id/action_button_previous"
-                    android:layout_alignLeft="@id/audio_player_current_time"
-                    android:contentDescription="@string/accessibility_shuffle"
-                    android:scaleType="center"
-                    android:src="@drawable/btn_playback_shuffle_all" />
-            </RelativeLayout>
-
-            <!-- This is the right side of the progress bar - it has the next
-            and repeat button and the total time text -->
-            <RelativeLayout
-                android:layout_width="@dimen/audio_player_controls_side_width"
-                android:layout_height="fill_parent"
-                android:layout_toRightOf="@id/play_pause_container"
-                android:paddingTop="@dimen/audio_player_control_padding_top">
-                <com.cyngn.eleven.widgets.RepeatingImageButton
-                    android:id="@+id/action_button_next"
-                    android:layout_width="@dimen/audio_player_controls_end_button_width"
-                    android:layout_height="@dimen/audio_player_controls_end_button_height"
-                    android:layout_alignParentTop="true"
-                    android:layout_alignParentRight="true"
-                    android:scaleType="center"
-                    android:src="@drawable/btn_playback_next" />
-
-                <TextView
-                    android:id="@+id/audio_player_total_time"
-                    android:layout_width="fill_parent"
-                    android:layout_height="@dimen/audio_player_controls_end_button_height"
-                    android:layout_toLeftOf="@id/action_button_next"
-                    android:gravity="right|center_vertical"
-                    android:paddingRight="@dimen/audio_player_time_text_padding"
-                    android:textColor="@color/audio_player_text_color"
-                    android:textSize="@dimen/audio_player_time_text_size"
-                    android:textStyle="bold"/>
-
-                <com.cyngn.eleven.widgets.RepeatButton
-                    android:id="@+id/action_button_repeat"
-                    android:layout_width="@dimen/audio_player_controls_end_button_width"
-                    android:layout_height="@dimen/audio_player_controls_end_button_height"
-                    android:layout_below="@id/action_button_next"
-                    android:layout_alignRight="@id/audio_player_total_time"
-                    android:contentDescription="@string/accessibility_repeat"
-                    android:focusable="true"
-                    android:scaleType="center"
-                    android:src="@drawable/btn_playback_repeat_all" />
-
-            </RelativeLayout>
+            <TextView
+                android:id="@+id/audio_player_total_time"
+                android:layout_width="52dp"
+                android:layout_height="@dimen/audio_player_controls_end_button_height"
+                android:layout_alignParentLeft="true"
+                android:layout_centerVertical="true"
+                android:paddingRight="@dimen/audio_player_time_text_padding"
+                android:gravity="right|center_vertical"
+                android:textColor="@color/audio_player_text_color"
+                android:textSize="@dimen/audio_player_time_text_size"
+                android:textStyle="bold"/>
+
+            <com.cyngn.eleven.widgets.RepeatingImageButton
+                android:id="@+id/action_button_next"
+                android:layout_width="@dimen/audio_player_controls_end_button_width"
+                android:layout_height="@dimen/audio_player_controls_end_button_height"
+                android:layout_toRightOf="@id/audio_player_total_time"
+                android:layout_centerVertical="true"
+                android:scaleType="fitCenter"
+                android:src="@drawable/btn_playback_next" />
+
+            <!-- divider -->
+            <View
+                android:layout_height="@dimen/audio_player_divider_height"
+                android:layout_width="@dimen/audio_player_divider_length"
+                android:layout_marginLeft="@dimen/audio_player_divider_horizontal_offset"
+                android:layout_marginBottom="@dimen/audio_player_divider_vertical_offset"
+                android:layout_alignParentLeft="true"
+                android:layout_above="@id/audio_player_total_time"
+                android:background="@color/now_playing_divider" />
+
+            <!-- divider -->
+            <View
+                android:layout_height="@dimen/audio_player_divider_height"
+                android:layout_width="@dimen/audio_player_divider_length"
+                android:layout_marginLeft="@dimen/audio_player_divider_horizontal_offset"
+                android:layout_marginTop="@dimen/audio_player_divider_vertical_offset"
+                android:layout_alignParentLeft="true"
+                android:layout_below="@id/audio_player_total_time"
+                android:background="@color/now_playing_divider" />
+
+            <com.cyngn.eleven.widgets.QueueButton
+                android:id="@+id/action_button_queue"
+                android:layout_width="@dimen/audio_player_controls_end_button_width"
+                android:layout_height="@dimen/audio_player_controls_end_button_height"
+                android:layout_above="@id/action_button_next"
+                android:layout_alignRight="@id/action_button_next"
+                android:layout_marginRight="@dimen/audio_player_controls_end_button_half_width"
+                android:layout_marginBottom="@dimen/audio_player_secondary_control_offset"
+                android:contentDescription="@string/accessibility_queue"
+                android:focusable="true"
+                android:scaleType="fitCenter"
+                android:src="@drawable/btn_queue_icon" />
+
+            <com.cyngn.eleven.widgets.RepeatButton
+                android:id="@+id/action_button_repeat"
+                android:layout_width="@dimen/audio_player_controls_end_button_width"
+                android:layout_height="@dimen/audio_player_controls_end_button_height"
+                android:layout_below="@id/action_button_next"
+                android:layout_alignRight="@id/action_button_next"
+                android:layout_marginRight="@dimen/audio_player_controls_end_button_half_width"
+                android:layout_marginTop="@dimen/audio_player_secondary_control_offset"
+                android:contentDescription="@string/accessibility_repeat"
+                android:focusable="true"
+                android:scaleType="fitCenter"
+                android:src="@drawable/btn_playback_repeat_all" />
 
         </RelativeLayout>
-    </LinearLayout>
-</FrameLayout>
\ No newline at end of file
+
+    </RelativeLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/audio_player_header_bar.xml b/res/layout/audio_player_header_bar.xml
new file mode 100644
index 0000000..3ce250e
--- /dev/null
+++ b/res/layout/audio_player_header_bar.xml
@@ -0,0 +1,86 @@
+<!--
+  Copyright (C) 2014 Cyanogen, Inc.
+-->
+
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="@dimen/header_bar_height"
+    android:orientation="horizontal"
+    android:paddingStart="@dimen/header_bar_padding_left"
+    android:paddingEnd="@dimen/header_bar_padding_right">
+
+    <LinearLayout
+        android:id="@+id/header_bar_button_container"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:layout_centerVertical="true"
+        android:layout_alignParentEnd="true">
+
+        <ImageView
+            android:id="@+id/header_bar_add_button"
+            android:layout_width="@dimen/header_bar_custom_button_width"
+            android:layout_height="@dimen/header_bar_custom_button_height"
+            android:layout_gravity="center_vertical"
+            android:layout_weight="0"
+            android:layout_marginStart="@dimen/header_bar_button_padding"
+            android:layout_marginEnd="@dimen/header_bar_button_padding"
+            android:src="@drawable/btn_add_to_playlist"
+            android:scaleType="centerInside" />
+
+        <ImageView
+            android:id="@+id/header_bar_search_button"
+            android:layout_width="@dimen/header_bar_custom_button_width"
+            android:layout_height="@dimen/header_bar_custom_button_height"
+            android:layout_gravity="center_vertical"
+            android:layout_weight="0"
+            android:layout_marginStart="@dimen/header_bar_button_padding"
+            android:layout_marginEnd="@dimen/header_bar_button_padding"
+            android:src="@drawable/ic_action_search"
+            android:scaleType="centerInside" />
+
+        <ImageView
+            android:id="@+id/header_bar_menu_button"
+            android:layout_width="@dimen/header_bar_menu_button_width"
+            android:layout_height="@dimen/header_bar_menu_button_height"
+            android:layout_gravity="center_vertical"
+            android:layout_weight="0"
+            android:scaleType="centerInside"
+            android:layout_marginStart="@dimen/header_bar_button_padding"
+            android:src="@drawable/menu_button_light"/>
+    </LinearLayout>
+
+    <LinearLayout
+            android:id="@+id/header_bar_text_container"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:layout_alignParentStart="true"
+            android:layout_centerVertical="true"
+            android:layout_toStartOf="@id/header_bar_button_container">
+
+        <TextView
+                android:id="@+id/header_bar_song_title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:ellipsize="end"
+                android:maxLines="1"
+                android:textAllCaps="true"
+                android:textColor="@color/header_action_bar_text_color"
+                android:textSize="@dimen/text_size_medium"
+                android:textStyle="bold" />
+
+        <TextView
+                android:id="@+id/header_bar_artist_title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingBottom="2dp"
+                android:ellipsize="end"
+                android:maxLines="1"
+                android:textAllCaps="true"
+                android:fontFamily="sans-serif-light"
+                android:textColor="@color/header_action_bar_text_color"
+                android:textSize="@dimen/text_size_micro" />
+    </LinearLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 4c8b9c6..5ec19c6 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -104,4 +104,6 @@
     <!-- search no results text color -->
     <color name="no_results">#ff231f20</color>
     <color name="no_results_light">@color/white</color>
+
+    <color name="now_playing_divider">#40ffffff</color>
 </resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index da8b015..e3b9539 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -109,14 +109,16 @@
     <dimen name="playlist_detail_header_bottom_height">40.0dip</dimen>
 
     <!-- Audio player Buttons (play/pause/shuffle/repeat/next/previous)-->
-    <dimen name="audio_player_controls_end_button_width">30.0dip</dimen>
-    <dimen name="audio_player_controls_end_button_height">30.0dip</dimen>
-    <dimen name="audio_player_controls_main_button_width">80.0dip</dimen>
-    <dimen name="audio_player_controls_main_button_height">80.0dip</dimen>
+    <dimen name="audio_player_controls_end_button_width">34.0dip</dimen>
+    <dimen name="audio_player_controls_end_button_height">34.0dip</dimen>
+    <dimen name="audio_player_controls_end_button_half_width">17.0dip</dimen>
+    <dimen name="audio_player_controls_main_button_width">100.0dip</dimen>
+    <dimen name="audio_player_controls_main_button_height">100.0dip</dimen>
     <dimen name="audio_player_controls_top_button_width">26.0dip</dimen>
     <dimen name="audio_player_controls_top_button_height">30.0dip</dimen>
     <dimen name="audio_player_controls_side_width">83.0dip</dimen>
     <dimen name="audio_player_control_padding_top">26.0dip</dimen>
+    <dimen name="audio_player_secondary_control_offset">16dp</dimen>
 
     <!-- Audio player track text settings-->
     <dimen name="audio_player_track_name_padding_side">36.0dip</dimen>
@@ -124,8 +126,13 @@
     <dimen name="audio_player_track_text_size">14sp</dimen>
 
     <!-- Audio player time text settings-->
-    <dimen name="audio_player_time_text_padding">6.0dip</dimen>
-    <dimen name="audio_player_time_text_size">12sp</dimen>
+    <dimen name="audio_player_time_text_padding">3.0dip</dimen>
+    <dimen name="audio_player_time_text_size">@dimen/text_size_micro</dimen>
+
+    <dimen name="audio_player_divider_length">86.0dip</dimen>
+    <dimen name="audio_player_divider_height">1.0dip</dimen>
+    <dimen name="audio_player_divider_vertical_offset">8.0dip</dimen>
+    <dimen name="audio_player_divider_horizontal_offset">8.0dip</dimen>
 
     <!-- App Widgets -->
     <dimen name="app_widget_large_min_width">250.0dip</dimen>
@@ -159,18 +166,23 @@
     <dimen name="color_scheme_dialog_row_padding">8.0dip</dimen>
 
     <!-- Sliding Panel -->
-    <dimen name="sliding_panel_indicator_height">26.0dip</dimen>
+    <dimen name="sliding_panel_indicator_height">20.0dip</dimen>
     <dimen name="sliding_panel_shadow_height">0.0dip</dimen>
 
     <!-- Header Bar -->
+    <dimen name="header_bar_height">50.0dip</dimen>
     <dimen name="header_bar_up_width">30.0dip</dimen>
     <dimen name="header_bar_up_height">30.0dip</dimen>
-    <dimen name="header_bar_menu_button_width">30.0dip</dimen>
+    <dimen name="header_bar_menu_button_width">24.0dip</dimen>
     <dimen name="header_bar_menu_button_height">30.0dip</dimen>
     <dimen name="header_bar_custom_button_width">30.0dip</dimen>
     <dimen name="header_bar_custom_button_height">30.0dip</dimen>
     <dimen name="header_bar_button_padding_small">5.0dip</dimen>
     <dimen name="header_bar_button_padding_large">10.0dip</dimen>
+    <dimen name="header_bar_padding_left">16.0dp</dimen>
+    <dimen name="header_bar_padding_right">8.0dp</dimen>
+    <dimen name="header_bar_button_container_padding">8.0dp</dimen>
+    <dimen name="header_bar_button_padding">6.0dp</dimen>
 
     <!-- Title Page Indicator Settings -->
     <dimen name="tpi_height">50dp</dimen>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 9ca8ab1..864ba9b 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -119,6 +119,8 @@
     <string name="accessibility_repeat">Repeat</string>
     <string name="accessibility_repeat_all">Repeat all</string>
     <string name="accessibility_repeat_one">Repeat one</string>
+    <string name="accessibility_queue">Open Queue</string>
+    <string name="accessibility_browse">Browse Music</string>
 
     <!-- Toast messages -->
     <string name="set_as_ringtone">\'<xliff:g id="name" example="Alarm Bell">%s</xliff:g>\' set as ringtone</string>
diff --git a/src/com/cyngn/eleven/ui/HeaderBar.java b/src/com/cyngn/eleven/ui/HeaderBar.java
index a0c4098..c8d1433 100644
--- a/src/com/cyngn/eleven/ui/HeaderBar.java
+++ b/src/com/cyngn/eleven/ui/HeaderBar.java
@@ -172,7 +172,7 @@ public class HeaderBar extends LinearLayout implements View.OnClickListener,
     }
 
     /**
-     * @param text set the title text
+     * @param resId set the title text
      */
     public void setTitleText(int resId) {
         mTitleText.setText(resId);
diff --git a/src/com/cyngn/eleven/ui/activities/SlidingPanelActivity.java b/src/com/cyngn/eleven/ui/activities/SlidingPanelActivity.java
index 6840fad..2cddd34 100644
--- a/src/com/cyngn/eleven/ui/activities/SlidingPanelActivity.java
+++ b/src/com/cyngn/eleven/ui/activities/SlidingPanelActivity.java
@@ -16,7 +16,6 @@ import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.support.v4.view.ViewPager;
 import android.view.View;
-import android.view.ViewStub;
 import android.widget.LinearLayout;
 
 import com.cyngn.eleven.R;
@@ -36,7 +35,7 @@ import com.cyngn.eleven.widgets.BlurScrimImage;
  */
 public class SlidingPanelActivity extends BaseActivity {
 
-    enum Panel {
+    public enum Panel {
         Browse,
         MusicPlayer,
         Queue,
@@ -44,7 +43,6 @@ public class SlidingPanelActivity extends BaseActivity {
     }
 
     private SlidingUpPanelLayout mFirstPanel;
-    private HeaderBar mFirstHeaderBar;
     private SlidingUpPanelLayout mSecondPanel;
     protected Panel mTargetNavigatePanel;
 
@@ -122,9 +120,7 @@ public class SlidingPanelActivity extends BaseActivity {
             }
         });
 
-        // setup the header bar
-        mFirstHeaderBar = setupHeaderBar(R.id.firstHeaderBar, R.string.page_now_playing,
-                R.drawable.btn_queue_icon, mShowQueue, mShowBrowse);
+
     }
 
     private void setupSecondPanel() {
@@ -203,7 +199,7 @@ public class SlidingPanelActivity extends BaseActivity {
         showPanel(Panel.MusicPlayer);
     }
 
-    protected void showPanel(Panel panel) {
+    public void showPanel(Panel panel) {
         // TODO: Add ability to do this instantaneously as opposed to animate
         switch (panel) {
             case Browse:
@@ -249,7 +245,6 @@ public class SlidingPanelActivity extends BaseActivity {
     public void clearMetaInfo() {
         super.clearMetaInfo();
         mBlurScrimImage.transitionToDefaultState();
-        mFirstHeaderBar.setTitleText("");
     }
 
     @Override
@@ -258,9 +253,6 @@ public class SlidingPanelActivity extends BaseActivity {
 
         // load the blurred image
         mBlurScrimImage.loadBlurImage(ApolloUtils.getImageFetcher(this));
-
-        // Set the artist name
-        mFirstHeaderBar.setTitleText(MusicUtils.getArtistName());
     }
 
     protected AudioPlayerFragment getAudioPlayerFragment() {
diff --git a/src/com/cyngn/eleven/ui/fragments/AudioPlayerFragment.java b/src/com/cyngn/eleven/ui/fragments/AudioPlayerFragment.java
index 87ce56c..b5aa0f0 100644
--- a/src/com/cyngn/eleven/ui/fragments/AudioPlayerFragment.java
+++ b/src/com/cyngn/eleven/ui/fragments/AudioPlayerFragment.java
@@ -15,6 +15,9 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.IBinder;
 import android.os.Message;
+import android.provider.MediaStore.Audio.Albums;
+import android.provider.MediaStore.Audio.Artists;
+import android.provider.MediaStore.Audio.Playlists;
 import android.support.v4.app.Fragment;
 import android.support.v4.view.ViewPager;
 import android.util.Log;
@@ -28,10 +31,6 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.PopupMenu;
 import android.widget.TextView;
-
-import android.provider.MediaStore.Audio.Playlists;
-import android.provider.MediaStore.Audio.Albums;
-import android.provider.MediaStore.Audio.Artists;
 import com.cyngn.eleven.MusicPlaybackService;
 import com.cyngn.eleven.R;
 import com.cyngn.eleven.adapters.AlbumArtPagerAdapter;
@@ -44,7 +43,9 @@ import com.cyngn.eleven.menu.FragmentMenuItems;
 import com.cyngn.eleven.utils.ApolloUtils;
 import com.cyngn.eleven.utils.MusicUtils;
 import com.cyngn.eleven.utils.NavUtils;
+import com.cyngn.eleven.widgets.BrowseButton;
 import com.cyngn.eleven.widgets.PlayPauseProgressButton;
+import com.cyngn.eleven.widgets.QueueButton;
 import com.cyngn.eleven.widgets.RepeatButton;
 import com.cyngn.eleven.widgets.RepeatingImageButton;
 import com.cyngn.eleven.widgets.ShuffleButton;
@@ -65,6 +66,16 @@ public class AudioPlayerFragment extends Fragment implements ServiceConnection {
     // fragment view
     private ViewGroup mRootView;
 
+    // Header views
+    private TextView mSongTitle;
+    private TextView mArtistName;
+
+    // Playlist Button
+    private ImageView mAddToPlaylistButton;
+
+    // Menu Button
+    private ImageView mMenuButton;
+
     // Message to refresh the time
     private static final int REFRESH_TIME = 1;
 
@@ -86,14 +97,8 @@ public class AudioPlayerFragment extends Fragment implements ServiceConnection {
     // Next button
     private RepeatingImageButton mNextButton;
 
-    // Playlist button
-    private ImageView mAddToPlaylistButton;
-
-    // Menu button
-    private ImageView mMenuButton;
-
-    // Track name
-    private TextView mTrackName;
+    private BrowseButton mBrowseButton;
+    private QueueButton mQueueButton;
 
     // Album art ListView
     private ViewPager mAlbumArtViewPager;
@@ -158,6 +163,10 @@ public class AudioPlayerFragment extends Fragment implements ServiceConnection {
                              final Bundle savedInstanceState) {
         // The View for the fragment's UI
         mRootView = (ViewGroup) inflater.inflate(R.layout.activity_player_fragment, null);
+
+        // Header title values
+        initHeaderBar();
+
         initPlaybackControls();
         return mRootView;
     }
@@ -255,27 +264,27 @@ public class AudioPlayerFragment extends Fragment implements ServiceConnection {
     }
 
     /**
-     * Initializes the items in the now playing screen
+     * Initializes the header bar
      */
-    @SuppressWarnings("deprecation")
-    private void initPlaybackControls() {
-        // Play and pause button
-        mPlayPauseProgressButton = (PlayPauseProgressButton)mRootView.findViewById(R.id.playPauseProgressButton);
-        // Shuffle button
-        mShuffleButton = (ShuffleButton)mRootView.findViewById(R.id.action_button_shuffle);
-        // Repeat button
-        mRepeatButton = (RepeatButton)mRootView.findViewById(R.id.action_button_repeat);
-        // Previous button
-        mPreviousButton = (RepeatingImageButton)mRootView.findViewById(R.id.action_button_previous);
-        // Next button
-        mNextButton = (RepeatingImageButton)mRootView.findViewById(R.id.action_button_next);
-        // Track name
-        mTrackName = (TextView)mRootView.findViewById(R.id.audio_player_track_name);
-        mTrackName.setSelected(true);
-        mTrackName.setOnClickListener(mOpenAlbumProfile);
+    private void initHeaderBar() {
+        // Title text
+        mSongTitle = (TextView) mRootView.findViewById(R.id.header_bar_song_title);
+        mArtistName = (TextView) mRootView.findViewById(R.id.header_bar_artist_title);
+
+        // Buttons
+        // Search Button
+        View v = mRootView.findViewById(R.id.header_bar_search_button);
+        v.setBackground(new HoloSelector(getActivity()));
+        v.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                NavUtils.openSearch(getActivity(), "");
+            }
+        });
 
+        // Add to Playlist Button
         // Setup the playlist button - add a click listener to show the context
-        mAddToPlaylistButton = (ImageView)mRootView.findViewById(R.id.action_button_add_to_playlist);
+        mAddToPlaylistButton = (ImageView) mRootView.findViewById(R.id.header_bar_add_button);
         mAddToPlaylistButton.setBackground(new HoloSelector(getActivity()));
 
         // Create the context menu when requested
@@ -297,8 +306,9 @@ public class AudioPlayerFragment extends Fragment implements ServiceConnection {
             }
         });
 
+        // Add the menu button
         // menu button
-        mMenuButton = (ImageView)mRootView.findViewById(R.id.action_button_menu);
+        mMenuButton = (ImageView) mRootView.findViewById(R.id.header_bar_menu_button);
         mMenuButton.setBackground(new HoloSelector(getActivity()));
         mMenuButton.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -306,7 +316,21 @@ public class AudioPlayerFragment extends Fragment implements ServiceConnection {
                 showPopupMenu();
             }
         });
+    }
 
+    /**
+     * Initializes the items in the now playing screen
+     */
+    private void initPlaybackControls() {
+        mPlayPauseProgressButton = (PlayPauseProgressButton)mRootView.findViewById(R.id.playPauseProgressButton);
+        mShuffleButton = (ShuffleButton)mRootView.findViewById(R.id.action_button_shuffle);
+        mRepeatButton = (RepeatButton)mRootView.findViewById(R.id.action_button_repeat);
+        mPreviousButton = (RepeatingImageButton)mRootView.findViewById(R.id.action_button_previous);
+        mNextButton = (RepeatingImageButton)mRootView.findViewById(R.id.action_button_next);
+        mBrowseButton = (BrowseButton)mRootView.findViewById(R.id.action_button_browse);
+        mBrowseButton.setActivity(getActivity());
+        mQueueButton = (QueueButton)mRootView.findViewById(R.id.action_button_queue);
+        mQueueButton.setActivity(getActivity());
 
         // Album art view pager
         mAlbumArtViewPager = (ViewPager)mRootView.findViewById(R.id.audio_player_album_art_viewpager);
@@ -341,9 +365,9 @@ public class AudioPlayerFragment extends Fragment implements ServiceConnection {
         // Total time
         mTotalTime = (TextView)mRootView.findViewById(R.id.audio_player_total_time);
 
-        // Set the repeat listner for the previous button
+        // Set the repeat listener for the previous button
         mPreviousButton.setRepeatListener(mRewindListener);
-        // Set the repeat listner for the next button
+        // Set the repeat listener for the next button
         mNextButton.setRepeatListener(mFastForwardListener);
 
         mPlayPauseProgressButton.enableAndShow();
@@ -354,7 +378,8 @@ public class AudioPlayerFragment extends Fragment implements ServiceConnection {
      */
     private void updateNowPlayingInfo() {
         // Set the track name
-        mTrackName.setText(MusicUtils.getTrackName());
+        mSongTitle.setText(MusicUtils.getTrackName());
+        mArtistName.setText(MusicUtils.getArtistName());
 
         // Set the total time
         String totalTime = MusicUtils.makeShortTimeString(getActivity(), MusicUtils.duration() / 1000);
@@ -592,7 +617,6 @@ public class AudioPlayerFragment extends Fragment implements ServiceConnection {
             final long pos = mPosOverride < 0 ? MusicUtils.position() : mPosOverride;
             if (pos >= 0 && MusicUtils.duration() > 0) {
                 refreshCurrentTimeText(pos);
-                final int progress = (int)(1000 * pos / MusicUtils.duration());
 
                 if (mFromTouch) {
                     return 500;
@@ -652,18 +676,6 @@ public class AudioPlayerFragment extends Fragment implements ServiceConnection {
         }
     };
 
-    /**
-     * Opens to the current album profile
-     */
-    private final View.OnClickListener mOpenAlbumProfile = new View.OnClickListener() {
-
-        @Override
-        public void onClick(final View v) {
-            NavUtils.openAlbumProfile(getActivity(), MusicUtils.getAlbumName(),
-                    MusicUtils.getArtistName(), MusicUtils.getCurrentAlbumId());
-        }
-    };
-
     public void showPopupMenu() {
         // create the popup menu
         if (mPopupMenu == null) {
diff --git a/src/com/cyngn/eleven/widgets/AudioActivityButton.java b/src/com/cyngn/eleven/widgets/AudioActivityButton.java
new file mode 100644
index 0000000..bab45aa
--- /dev/null
+++ b/src/com/cyngn/eleven/widgets/AudioActivityButton.java
@@ -0,0 +1,18 @@
+package com.cyngn.eleven.widgets;
+import android.content.Context;
+import android.support.v4.app.FragmentActivity;
+import android.util.AttributeSet;
+
+import com.cyngn.eleven.ui.activities.SlidingPanelActivity;
+
+public abstract class AudioActivityButton extends AudioButton {
+    protected SlidingPanelActivity mActivity;
+
+    public AudioActivityButton(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public void setActivity(FragmentActivity activity) {
+        mActivity = (SlidingPanelActivity)activity;
+    }
+}
\ No newline at end of file
diff --git a/src/com/cyngn/eleven/widgets/AudioButton.java b/src/com/cyngn/eleven/widgets/AudioButton.java
new file mode 100644
index 0000000..42bf013
--- /dev/null
+++ b/src/com/cyngn/eleven/widgets/AudioButton.java
@@ -0,0 +1,39 @@
+package com.cyngn.eleven.widgets;
+
+import android.content.Context;
+import android.text.TextUtils;
+import android.util.AttributeSet;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.View.OnLongClickListener;
+import android.widget.ImageButton;
+
+import com.cyngn.eleven.utils.ApolloUtils;
+import com.cyngn.eleven.widgets.theme.HoloSelector;
+
+public abstract class AudioButton extends ImageButton implements OnClickListener, OnLongClickListener {
+    public static float ACTIVE_ALPHA = 1.0f;
+    public static float INACTIVE_ALPHA = 0.4f;
+
+    @SuppressWarnings("deprecation")
+    public AudioButton(final Context context, final AttributeSet attrs) {
+        super(context, attrs);
+        // Theme the selector
+        setPadding(0, 0, 0, 0);
+        setBackgroundDrawable(new HoloSelector(context));
+        // Control playback (cycle shuffle)
+        setOnClickListener(this);
+        // Show the cheat sheet
+        setOnLongClickListener(this);
+    }
+
+    @Override
+    public boolean onLongClick(final View view) {
+        if (TextUtils.isEmpty(view.getContentDescription())) {
+            return false;
+        } else {
+            ApolloUtils.showCheatSheet(view);
+            return true;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/com/cyngn/eleven/widgets/BrowseButton.java b/src/com/cyngn/eleven/widgets/BrowseButton.java
new file mode 100644
index 0000000..825f841
--- /dev/null
+++ b/src/com/cyngn/eleven/widgets/BrowseButton.java
@@ -0,0 +1,19 @@
+package com.cyngn.eleven.widgets;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.View;
+
+import com.cyngn.eleven.ui.activities.SlidingPanelActivity;
+
+public class BrowseButton extends AudioActivityButton {
+
+    public BrowseButton(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    @Override
+    public void onClick(View view) {
+        mActivity.showPanel(SlidingPanelActivity.Panel.Browse);
+    }
+}
\ No newline at end of file
diff --git a/src/com/cyngn/eleven/widgets/PlayPauseProgressButton.java b/src/com/cyngn/eleven/widgets/PlayPauseProgressButton.java
index f50d340..05d57cc 100644
--- a/src/com/cyngn/eleven/widgets/PlayPauseProgressButton.java
+++ b/src/com/cyngn/eleven/widgets/PlayPauseProgressButton.java
@@ -5,6 +5,7 @@ package com.cyngn.eleven.widgets;
 
 import android.content.Context;
 import android.util.AttributeSet;
+import android.util.Log;
 import android.widget.FrameLayout;
 import android.widget.ProgressBar;
 
@@ -49,7 +50,8 @@ public class PlayPauseProgressButton extends FrameLayout {
         // Make the play pause button size dependent on the container size
         int horizontalPadding = getMeasuredWidth() / 4;
         int verticalPadding = getMeasuredHeight() / 4;
-        mPlayPauseButton.setPadding(horizontalPadding, horizontalPadding,
+        mPlayPauseButton.setPadding(
+                horizontalPadding, horizontalPadding,
                 verticalPadding, verticalPadding);
 
         // rotate the progress bar 90 degrees counter clockwise so that the
diff --git a/src/com/cyngn/eleven/widgets/QueueButton.java b/src/com/cyngn/eleven/widgets/QueueButton.java
new file mode 100644
index 0000000..43404ce
--- /dev/null
+++ b/src/com/cyngn/eleven/widgets/QueueButton.java
@@ -0,0 +1,19 @@
+package com.cyngn.eleven.widgets;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.View;
+
+import com.cyngn.eleven.ui.activities.SlidingPanelActivity;
+
+public class QueueButton extends AudioActivityButton {
+
+    public QueueButton(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    @Override
+    public void onClick(View view) {
+        mActivity.showPanel(SlidingPanelActivity.Panel.Queue);
+    }
+}
\ No newline at end of file
diff --git a/src/com/cyngn/eleven/widgets/RepeatButton.java b/src/com/cyngn/eleven/widgets/RepeatButton.java
index 962ce06..707523b 100644
--- a/src/com/cyngn/eleven/widgets/RepeatButton.java
+++ b/src/com/cyngn/eleven/widgets/RepeatButton.java
@@ -12,68 +12,31 @@
 package com.cyngn.eleven.widgets;
 
 import android.content.Context;
-import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.View.OnLongClickListener;
 import android.widget.ImageButton;
 
 import com.cyngn.eleven.MusicPlaybackService;
 import com.cyngn.eleven.R;
-import com.cyngn.eleven.utils.ApolloUtils;
 import com.cyngn.eleven.utils.MusicUtils;
-import com.cyngn.eleven.widgets.theme.HoloSelector;
 
 /**
  * A custom {@link ImageButton} that represents the "repeat" button.
  * 
  * @author Andrew Neal (andrewdneal@gmail.com)
  */
-public class RepeatButton extends ImageButton implements OnClickListener, OnLongClickListener {
-    public static float ACTIVE_ALPHA = 1.0f;
-    public static float INACTIVE_ALPHA = 0.4f;
-
-    /**
-     * @param context The {@link Context} to use
-     * @param attrs The attributes of the XML tag that is inflating the view.
-     */
-    @SuppressWarnings("deprecation")
+public class RepeatButton extends AudioButton {
     public RepeatButton(final Context context, final AttributeSet attrs) {
         super(context, attrs);
-        // Set the selector
-        setBackgroundDrawable(new HoloSelector(context));
-        // Control playback (cycle repeat modes)
-        setOnClickListener(this);
-        // Show the cheat sheet
-        setOnLongClickListener(this);
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public void onClick(final View v) {
         MusicUtils.cycleRepeat();
         updateRepeatState();
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean onLongClick(final View view) {
-        if (TextUtils.isEmpty(view.getContentDescription())) {
-            return false;
-        } else {
-            ApolloUtils.showCheatSheet(view);
-            return true;
-        }
-    }
-
-    /**
-     * Sets the correct drawable for the repeat state.
-     */
+    /** Sets the correct drawable for the repeat state. */
     public void updateRepeatState() {
         switch (MusicUtils.getRepeatMode()) {
             case MusicPlaybackService.REPEAT_ALL:
@@ -95,4 +58,4 @@ public class RepeatButton extends ImageButton implements OnClickListener, OnLong
                 break;
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/com/cyngn/eleven/widgets/RepeatingImageButton.java b/src/com/cyngn/eleven/widgets/RepeatingImageButton.java
index 0becdb4..f5440a5 100644
--- a/src/com/cyngn/eleven/widgets/RepeatingImageButton.java
+++ b/src/com/cyngn/eleven/widgets/RepeatingImageButton.java
@@ -32,16 +32,6 @@ import com.cyngn.eleven.widgets.theme.HoloSelector;
  */
 public class RepeatingImageButton extends ImageButton implements OnClickListener {
 
-    /**
-     * Next button theme resource
-     */
-    private static final String NEXT = "btn_playback_next";
-
-    /**
-     * Previous button theme resource
-     */
-    private static final String PREVIOUS = "btn_playback_previous";
-
     private static final long sInterval = 400;
 
     private long mStartTime;
@@ -58,6 +48,7 @@ public class RepeatingImageButton extends ImageButton implements OnClickListener
     public RepeatingImageButton(final Context context, final AttributeSet attrs) {
         super(context, attrs);
         // Theme the selector
+        setPadding(0, 0, 0, 0);
         setBackgroundDrawable(new HoloSelector(context));
         setFocusable(true);
         setLongClickable(true);
diff --git a/src/com/cyngn/eleven/widgets/ShuffleButton.java b/src/com/cyngn/eleven/widgets/ShuffleButton.java
index 3efdb90..83a5200 100644
--- a/src/com/cyngn/eleven/widgets/ShuffleButton.java
+++ b/src/com/cyngn/eleven/widgets/ShuffleButton.java
@@ -12,66 +12,28 @@
 package com.cyngn.eleven.widgets;
 
 import android.content.Context;
-import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.View.OnLongClickListener;
-import android.widget.ImageButton;
 
 import com.cyngn.eleven.MusicPlaybackService;
 import com.cyngn.eleven.R;
-import com.cyngn.eleven.utils.ApolloUtils;
 import com.cyngn.eleven.utils.MusicUtils;
-import com.cyngn.eleven.widgets.theme.HoloSelector;
 
 /**
  * @author Andrew Neal (andrewdneal@gmail.com)
  */
-public class ShuffleButton extends ImageButton implements OnClickListener, OnLongClickListener {
-    public static float ACTIVE_ALPHA = 1.0f;
-    public static float INACTIVE_ALPHA = 0.4f;
-
-    /**
-     * @param context The {@link Context} to use
-     * @param attrs The attributes of the XML tag that is inflating the view.
-     */
-    @SuppressWarnings("deprecation")
+public class ShuffleButton extends AudioButton {
     public ShuffleButton(final Context context, final AttributeSet attrs) {
         super(context, attrs);
-        // Theme the selector
-        setBackgroundDrawable(new HoloSelector(context));
-        // Control playback (cycle shuffle)
-        setOnClickListener(this);
-        // Show the cheat sheet
-        setOnLongClickListener(this);
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public void onClick(final View v) {
         MusicUtils.cycleShuffle();
         updateShuffleState();
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean onLongClick(final View view) {
-        if (TextUtils.isEmpty(view.getContentDescription())) {
-            return false;
-        } else {
-            ApolloUtils.showCheatSheet(view);
-            return true;
-        }
-    }
-
-    /**
-     * Sets the correct drawable for the shuffle state.
-     */
+    /** Sets the correct drawable for the shuffle state. */
     public void updateShuffleState() {
         switch (MusicUtils.getShuffleMode()) {
             case MusicPlaybackService.SHUFFLE_NORMAL:
@@ -90,5 +52,4 @@ public class ShuffleButton extends ImageButton implements OnClickListener, OnLon
                 break;
         }
     }
-
-}
+}
\ No newline at end of file
-- 
2.11.0