From 3f870ced445a1ae7ee326db361260496e1cad379 Mon Sep 17 00:00:00 2001 From: Christopher Eby Date: Wed, 1 Feb 2012 13:38:34 -0600 Subject: [PATCH] Use ActionBar in library --- AndroidManifest.xml | 3 +- res/drawable-hdpi-v11/ic_menu_search.png | Bin 0 -> 1800 bytes res/drawable-mdpi-v11/ic_menu_search.png | Bin 0 -> 1133 bytes res/drawable-xhdpi-v11/ic_menu_search.png | Bin 0 -> 2976 bytes res/layout/actionbar_controls.xml | 57 ++++++++ res/layout/library_content.xml | 4 - res/values-v11/untranslatable.xml | 6 + res/values/untranslatable.xml | 2 +- src/org/kreed/vanilla/ActionBarControls.java | 61 +++++++++ src/org/kreed/vanilla/CompatHoneycomb.java | 121 +++++++++++++++++ .../kreed/vanilla/FullPlaybackActivity.java | 2 + src/org/kreed/vanilla/LibraryActivity.java | 124 +++++++++++------- src/org/kreed/vanilla/PlaybackActivity.java | 1 - 13 files changed, 329 insertions(+), 52 deletions(-) create mode 100644 res/drawable-hdpi-v11/ic_menu_search.png create mode 100755 res/drawable-mdpi-v11/ic_menu_search.png create mode 100644 res/drawable-xhdpi-v11/ic_menu_search.png create mode 100644 res/layout/actionbar_controls.xml create mode 100644 src/org/kreed/vanilla/ActionBarControls.java create mode 100644 src/org/kreed/vanilla/CompatHoneycomb.java diff --git a/AndroidManifest.xml b/AndroidManifest.xml index de7148e2..39ca5ab5 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -49,7 +49,8 @@ THE SOFTWARE. android:launchMode="singleTop" /> zP6J%cAVn2G-+u%MQIn(BB)3yg|1~|MTkn35J+VoCP3l~ z5@JFE2?1!o(MjCF|bnbMEi_&w1{7e1V_r$2O|ahrj^%hsKLJ2~b5TRi>>L48~5k-hd{o z!HSyT%PPQ7zY}DBSMp*bliIVwT!p2mCf(&K6p+OvhI|95D7cEu3d=PQz)g8D8;#j^ zYQ8nFy{bhClMhoE;?s6#_Ts3x;60rh2B~a+AAm+-&g!WSt8G)m?~J?2Rm_w@Y4M)( zQo1jy_n2ouI-6wyO6jRees=WuHnH*dk=NX-S;3e%%7<}`&r@0igwJWiLq^8`Nl0U7 z$fhckQ$eLP2LSHTZr>N$$>1SnZ~o2n$P{JSfeK%9&11et6u$$pC;!Zl{txrCMiwvJ zj1mPz3|Fh{*c*8mzyWdJL|1>VR~!wUyx~*+JpV-^`GImsyG;+v4p+kX*k2vZrl`z{ zqLO32$=AQ@p|x-6kne~GN9Bo?-Crhw&FIFja1e~}(y`l@v>pt#$+-H9sZ+gtfXb{U zQF_|n>{8CUA;XS`_ESD?%^xE8?s z6|CM_vz8(D4PgYTvC{xJX3+1Mt=9VFLPXBo0ht-s#Bz8skV_kf26VjjXRy003y!- zFp-!ECq*=Iqjr2taNS;iSa#F%U!whfpg!;*}f*H(!c;+rJ7Fz(vy;xc?p5;$0^1&MYX0f0&>djk`{Ue&xWcngEGO0PWX zT(WcQ7pv4QN;_0(iWJpL$xxrn{wdz}wo)D@P@ z#Vv)I#GrU?x_kOSu$`H6Vh}&0WBlNF^lYRnoy?Lw2cgWqAVE}<^9-hPAF1!D!EC2TAke_z73eTJeKB7!%BDlIoB{w)$YCH99B)Ar)f?3z z)u1$w<#P#4(8X1sLG8b%eSL3@?l>giK*e#oe>`?J(v?omF4VlE%3+X#@d@<&=99O> znLwrrE?7u=#~(?Yv5ta?3Trf-nG^sjY;54ah3;P)L!=8yDrxsZ+Z|!PXY|U|9e3T? znXKH%C){Rl?OenLW1o>4!`H>}Q3+sK0J z?X-8RCNLr%GxuN84v!8K75lZQ7a|olfwh|pTkeX~i$l}#A^iwGx5>r18J|VIaa}>^ zE6o-t6b%lHCqQ1#EbgYW%|oxlBuSHadeI4A&*eSaefw qW^{L9a%BKPWN%_+AW3auXJt}lVPtu6$z?nM0000k4UOiAAEE)4(M`_JqL@;D1TB8!2v z2N=7Z%(epwmK8Xr18D^?ZvQoBE&~H|si%u$h{y4xlj41*mP#DAKmXpA{ahoTjD>*$ zPok4U=F=;gr)5Ov#H`+W)or5gtu@_xuNSSg%)b>=9JlRSM7HqU)Aq%u*YqwDG~RUc z(!$2Mnjvye`d6^`9A-RUdH?%MCl>z#ue?_~tLyiF|M_R%`R_ju{g0jW@XNQIi%z?V zEp^mA`N4yYwMnT(L%BmJx#i@}%k}ImGexfKI)8K1#ys!3rPm)OecByyUw_`@ZxTsY z{-!%H3fE+9v){SzV{^db6=z~!INr6i`e2zpf$i-%9*y*ffJ6HB`^~+-BtL)gb)u%S z_UCxr9Mi{Jd`e^=nQRKRHqsK9vg_E}cy{GmHuvt&E!Gnh|HztdW@1xi@?zF;cja83 z=tnxA4(&SpPMmN3smsf>_scz49?~?$-c(rq)A6nIv+sSH&dRs^MSbt)Zjl+4vfA@j z$1UF-G%>#;fhEPwrKauPy7%^laZ|qX3uVPCnR7QxeaP_ahC%wl)vGjCty_Cwrm|s5 zF=J{9lZbXez~h}~^228`Ro4ZHE0ozi^N1B|^*DP`Q3bEAEnln`)^ zL6I@fWp0tC{sH!VKjUo~8fV$8=eu#|1P8-|qVhwF{qKA8o{{oq=vl&2k&tcp>+t-Z zWu4y48UlYG1x@*0#C=%gv4sX>Ou^3m`(Ebyo7+C$x#?C)&;pLllWnbqLf@?C+wv(O zaGHVZ#QDD3+uv$`-CRA%?#1P!)ibz*^fYfBzxO@(>$0mdUF+r6%wK2x+R1;<$B60; zZi@GRhh94yv|1(oiJZD-`MHe=({JoD{C#EfdXqQb)<0O*lN8wIUj23P%(?rxUKS-^ z>wMBa*Y~(}uJXEnzKlB*4u4z4t$ys=uV2M!I_~Q(r@rrc|HAfav6Tp)jnCfSJyTcQ zd4Jce;GF4atxM`c4kwp2aWOgcENoiHIs1D3ojoW0y4-s!&9^?kJ?-)Qn{sbTSU>Yb zCRZozyDu!L)aZTkB(GHKt>vq(@8}Y|xht(u000W8Nklr;32t^2EU&OP^>+rV3TOaITJKjHWMX9i`w4;^a+0`I}MU%x4D z)~xD}(+d#r88`$12}z=hxOs;z1H`s8$D6_nXn=q|G&lkfx6ZeRNu-dVm?c-E-)Mr1 z0D_nRg>Y-8-AFMod?+$ta2X$wkEQ$$q|pu+7EAy>JXBCbp?#%TGLb}{46ffO022*Z z@Tr4W&}l9w(2YU2w>Oh+b1hSu5~zoMP^srii#ffB1?0x6GhrN+8v~#q0DvrjJd*}^ z!rT_`-QymxcFBH9p$&`@mT`_xhDYjWOSQ#tR?Se>4RTvp7gqt$^lp9{ZkM-5k7s%h zw*O=7c1pm2(S!pKaX<~q;&Ali)n^OAg88yN<$HCy-o>dl_>Mx3m>>shdvNRD^?b-V zAjYT-AdhBIKpg}Joft%n6PysY#(!%+>KsuG%bj)#t7|UYB0%%~+CVV6gT3j!@9ewJ zI!F#Prg?^E!}+ir)iuG9X*I0I#3%-+n?}r3${0T(Ylu&(YPe?D&6%PFz(fQ4_*H@( z?6Y_OW&eY*cSfv>G=)d~Cu@^sR8U6P8k1 zg%9Osr|G2wuU#n02I~ethF>AeUL@*V>@Ak-i$>ng#6~GihFB1@2$tQFuQzJ}(fUOa z7rW$8Z|ZJy05!ab?-u4~=$L-xh!27YXr7*44|{8@2{M32%5%2UU3P>51uAK5TL=YUm83~L=Oc0Gr_6XRvvFG zAW3hR6LF*0OKl)N*z@Kgf?mRGn{FymIdql|OqxhGa< znJ9w;vA#~EvFU2zjQ|AXsFFZ3Na7~9DeE-FX?#{zPniiTv?R<3-*^^oX;;l(l#7_uNc$!*?Qn<

5$-%rr)$gZ7E1%U{bmmYGXFj z=ZwfSkIHtl>@FmAS{nr(XGN{5?zoNxy~XI zaUQ`6F!#zGNDxRvXrMwT`QJ;AUkvJwwc5aWoO<}o{al4X z%(zPHdKCcRed?DJ*xNb&>8`u1-RJ_SjA@)hQP)|JLm3*y7z}_<<2CK;yHuJ1h@VDJ z)=L5h6|cf2-o_%57VRVK_>={p^@%PB5fzlgs=guA|Dq0yth=E zzknH97H)Ll&hbxnd|YuvXy#0&*YHUFKQ9$e$>R^7xmN=Q5u;^MZn$ZMFab!4@ElW- zOYZXO;&f)Z14*<=c_$sRm%ARv0uDu^ z3$sDMCK{0IYRjwanhgMwf%7EsL*^oinCeYr+qD~66$K!GXO_pylOEvVV|X$I534>2 zzFa#@YzafX2yRRJzAxX4vN zAmp`@NP?j;7=6+1?D`sNnESsk&%LCdZb6W5IyV3T1`yzT_&sVIG4$HSJv@Sc#=`&| zhahRzGhus5O~|GXXf4DDDRiq2>qN{`&-=55!HvBAChg_E9m2HxOFrw!+VW8TY` zN|QKgE`I`ODXy>g4~xx+lDrDp?d?+AM>><@bgh`fyg8LwDuxY;b8%g}a5De^fGjrK ztApGRfr47vmYw$6P$hLmWptAO445P!r7a^WN1@)UkAb=A@vZ!;aNYV69PE1ill|wI za=jcl0D=7G-cL8p)o5i5X2G;x0000bbVXQnWMOn=I%9HWVRU5xGB7bQ zEigANFfmjyGdeLgIx;scFgH3dFsWYQy#N3JC3HntbYx+4WjbwdWNBu305UK!F)c7R zEif@uFgH3hGdeOcEigAaFfef&fZYH902y>eSaefwW^{L9a%BKPWN%_+AW3auXJt}l WVPtu6$z?nM0000 + + + + + + + + diff --git a/res/layout/library_content.xml b/res/layout/library_content.xml index 3728ca8d..705e8437 100644 --- a/res/layout/library_content.xml +++ b/res/layout/library_content.xml @@ -26,10 +26,6 @@ THE SOFTWARE. android:orientation="vertical" android:layout_width="fill_parent" android:layout_height="fill_parent"> - ?android:textColorAlertDialogListItem + + diff --git a/res/values/untranslatable.xml b/res/values/untranslatable.xml index 8a646781..e4b1bad8 100644 --- a/res/values/untranslatable.xml +++ b/res/values/untranslatable.xml @@ -23,7 +23,7 @@ THE SOFTWARE.