From faed16030df5221f790a4d6fd5bdfb592db977fa Mon Sep 17 00:00:00 2001 From: Jim Miller Date: Tue, 8 Nov 2011 19:50:49 -0800 Subject: [PATCH] Fix 5579440: Add transport control view to tablet unlock screens This updated tablet layouts to support showing album art and transport control views in PIN, pattern and password screens of lock screen. It also allows the addition of a background protect asset and the ability to show the system wallpaper on layouts that define a transport_bg_protect view. Also updated layout to use new ICS-style buttons on lock screen and fixed bug with "forgot pattern" button where we were showing the emergency call icon. To avoid problems with leading ones in the mono-space clock font, we now right-justify status text on tablet and remove the AM/PM indicator. Status font size adjusted by UX. Added background protection drop shadow to transport control. Fixed portrait mode to be right-justified when transport is showing. Change-Id: I790292fc39f4588f87adc9d9241706817ae6baab --- .../android/internal/widget/DigitalClock.java | 3 +- .../drawable-hdpi/transportcontrol_bg.9.png | Bin 0 -> 4210 bytes .../drawable-mdpi/transportcontrol_bg.9.png | Bin 0 -> 2462 bytes .../drawable-xhdpi/transportcontrol_bg.9.png | Bin 0 -> 6659 bytes .../keyguard_screen_password_landscape.xml | 113 +++++++++++------- .../keyguard_screen_password_portrait.xml | 51 ++++++-- .../keyguard_screen_status_land.xml | 29 ++--- .../keyguard_screen_status_port.xml | 29 ++--- .../keyguard_screen_tab_unlock.xml | 37 +++++- .../keyguard_screen_tab_unlock_land.xml | 39 ++++-- .../keyguard_screen_unlock_landscape.xml | 51 +++++--- .../keyguard_screen_unlock_portrait.xml | 76 ++++++++---- .../keyguard_transport_control.xml | 111 +++++++++++++++++ core/res/res/values-sw600dp/dimens.xml | 2 +- .../policy/impl/LockPatternKeyguardView.java | 10 +- 15 files changed, 392 insertions(+), 159 deletions(-) create mode 100644 core/res/res/drawable-hdpi/transportcontrol_bg.9.png create mode 100644 core/res/res/drawable-mdpi/transportcontrol_bg.9.png create mode 100644 core/res/res/drawable-xhdpi/transportcontrol_bg.9.png create mode 100644 core/res/res/layout-sw600dp/keyguard_transport_control.xml diff --git a/core/java/com/android/internal/widget/DigitalClock.java b/core/java/com/android/internal/widget/DigitalClock.java index 6f24ebaea2ba3..daefc9a3046a5 100644 --- a/core/java/com/android/internal/widget/DigitalClock.java +++ b/core/java/com/android/internal/widget/DigitalClock.java @@ -106,7 +106,8 @@ public class DigitalClock extends RelativeLayout { private String mAmString, mPmString; AmPm(View parent, Typeface tf) { - mAmPmTextView = (TextView) parent.findViewById(R.id.am_pm); + // No longer used, uncomment if we decide to use AM/PM indicator again + // mAmPmTextView = (TextView) parent.findViewById(R.id.am_pm); if (mAmPmTextView != null && tf != null) { mAmPmTextView.setTypeface(tf); } diff --git a/core/res/res/drawable-hdpi/transportcontrol_bg.9.png b/core/res/res/drawable-hdpi/transportcontrol_bg.9.png new file mode 100644 index 0000000000000000000000000000000000000000..ebd6f8a1fe9c308f5e2127eb2cae32a220b8b553 GIT binary patch literal 4210 zcmV-&5RLDNP)hUZ4ca4QTPS?e$9B1{M+kn~y((G~B{g`&I8tRyf$zJeTFxr9Yp6r?9 zbwIINzgyXbTdil?bnF9lbU3K&6V-cluLjgCAklsu&~@x{r;ds3T*p)aLFF?5?ot(q zDp;LREy46Ei{TYeDlokYNDM?Bpk;L{ZSQo%qjVLZ8F*IUnr*kTAkLtfg{lLnDVTOX zU9AFC$-jb2b-B+j$e6lHn>+0SsWViuz;uDNsugfL0rSeDa<=|KM?P(JIZl?I342j_ zCiY@^c?PO($BN3?`a5-l)UoENfD)BO>8NZ)nJZ*zwk%3B{fNq#x(8J!a_72d1)ygG z)dkRQptix(1yUD8s{pZJp?p?uH51Y@aAtve)>`UYyWRsGe)W4`qi+xJV!d3=UR|sU&DDRcsi4ASDVj=2)CxZ%YZ5ri0MHip~lHSjT5ihLR zP^!x+A+${lNX*2tclc`9ir`^g3T?f9GpYb|k$ZS_K7%Sc|HY&|n9#AA^Q3KN9m$*Y zl`vLuoSAx*_Qq2UZ5~XS6L}XH)uBFEfOLA+p{AUxBeYc=Xlz+5T+$qs;M zXny?o@!w73I7B~x{``+TIumlKO2}h?>e8+2JrZ+QR{&xl(%Z9Zj6p+$0II??jyV*$ z5^6)M0ur+OtjvZK)Ru)P+MZn+B)g5kvhp6~Z9Rg8ErW_cVi%pLJ%T4&uT&v=XOJ{J zb}NEmvQKWhd}uYyx$Re8NOpxYuU!U@&YxXl92$-YDv?L0VdjAibLH^X{T^wgqd_t2 zA{L_YIlI2((P0KSI?X^e32 z9O(w?wJX`V6}g9qaiy`(v@>}iWueOEJy2|$44g_>d&f1BeY0)Tx(qoJa(sOZv{tGt zyxqFWm;V{}L1kGu%R*b`O7G%G-Zu*LTW>G4A$N+xoS1f==!JLpm;ZHr1ddnE0QByQ zZTppyu|+_kkFFQFhsXm;YbwNbF1AOR4QY1Eu8}G*on1P#q3(<9V4I0;_dS4aF%a4IEKHtTon6^O1_O~+7fhuAbjs@>GtiY#cXlDijpo2} zo@j|-)e6(hMPNFH$e#^s3`}QN1)`boCMu1}P=8A5xSO*Mqq_v{o4FL4=ywfm9#q*} zAw?lB+qX0TMp0bzKA|Hji`^)^r;$4E{}y6xHiGaoXE9-no~x>uyFC z>e*`MNRg$#14Kh;Y|+i)g*UH_IBi;V)SKJGq!AAynJ@f7VUDRnYixVdFVIsQTwwBjSYe0wHMHi zS#P$e3#6`fk8b1Leas}EP1(4zI&s?DHr~0HwZoCvb&pMFYXR?5{ZC$AQTo5#VsDfv z1bXeWHq+_^scNB~HP3v`u9b0DLjATd$A0rJ`Yy5l*k6oB{~XO1Nb7C%`NyPf{>wQg z`gfMR??-!c6G8u5{;8}bZu0L1uv@P! zx+pg9U9hXk4>+=am{X^3;{U$h?laok{_8&2ZS=9=+2gPmmvtoMU~OVSvOwrguzzA< zXs_71{jU@(MB{`0;}`F1yBTz1(iM=hG8Urh{IT-(p^nkvNaI9$!mTTL&Qx(F4awD% zc@QB-87?&Xd~^1h32lrMG0tS`SKP?96VtW|9MlX*5fmOwqpadK7b0JQ2=zDmXJf>q zGe?TtC|bLqeb6zzJmXrn&$bNBO-Z}fNLhL2J`7YDM3Dnp&^y*h2&9pYAew=RaVgYi zrhG~}{+Dfgk@QwyMBSc&NCShQVj#MjbT>#Vu7u#R;f`@0+cyceZK{IgIgZyZf+_nT zh$3*ZbrI`EJ3(UI$yO|Qwg?JN3tigPUF1_U;!HWaqJ8x)W0f7b{x^TXFwV- zG48Yy>TEy7)S>=QYXv0aPNOr~6P!pq5!!)7?g1M4Y(X6z+rBoi$JJv%$JNIlY2+N4 zE7=!}%u`*(m27|Q+<0RvYZfE~k*yc`1CN+36Xq;LBR#e@1Ti5^Lo@)g4kzGP-uN;{ zVqjuIo`s2lCn{&gRuTh}b(O3g>J;lrzfJoLD4WhMuwGz$A<{d(7c!z7fmwJ*f8Ou_ zVxU6(v|^!3;qpL=ps{txeMFU^4%qa{rVzwk$-9!&br@>rBkTIsypw$D1E-Tuk|$I{((@L1l%W?(AJ)!4kQL%R9dX zNWB(UJ95<}t$ZKJZpEZWK9d*bJech9uTH)Kkq1x~qFGm(fvEydbY8}d zyc>g71d@d!Q|3yjb12LWaCEu~6$8<%8`<%&uEf9;!ILery>r_>ueg!hzT!v-tgK9* z*jub4c`!v6-MV51(KA5ufQUe1Ad12nsz+_vGN`UU+IEFGEd-NJYp_I}|0?%=xu|{F z7m(~4NvA!KMxR-CnuTaJoS`upBo1?xj#_{Q6gF)EvM(JqR07g^Ytu*!NIK29 zQU=Y;lbh|2?R%TLenrA8zGs2b(CEAeMdh8*3`9d7Ol*i_9cKqX2>vCleAU*5F0ZWy zNOyP^CxvS2_HY$s@B0fCPu~B^`oG}2+ zI+9LD7q2rJeDo`wF=onEM>ZjM&NNJm0FC=vb7>Ckg*Gdso z0@7$}(@~l2OH@_?NvFHvsRA=C_U_9bjZr>JSGH`rdTehTs4lt?o;xwy?y!|X6u~te z?p8rUb-Q31+X`rCoAr4{U12V&pV_i$lxOQiq&9&wu4MBOOsH%HDCXR#zq6`byl#N9 zGMi@dS^1qhKtgpLE``b}@N__A>$6Fng=uVefinwHR`;#y-N?EUDr4a4bS!UQFQ1iL zv3D>FQM8>YWAk2FRQ{kYki5EQITf3Z$|}k(&Wt;GZP+xE_sW>MJIzesDom)X3n(@n zm93}?sH`kXGyRCln7RjbgA~0Ikf zLnP7zlE|@7e^K2lK_oJNp;sJc28bnyMEWOw2T)9#)%x99z4%)e$dmg(?V8}7PlIf` zXT#&E6N*_7+5j5bJ=w3anBQ^Eu8VQlI;LTNS4Z8oo##2?l|`3UE?nnD-v-dov+RGz zd0#b@W!iC(w}WH#DwBV7KX#w*=nHu`I99I$QlvBV@d!N~mPqe%kdZrJFE)g9Cb*@=C>$3x;TvndB zuHJhQGy(&jIBo6d5;Am!V<-Wvi$Xk;Q__>_^I0^~zPn zvWE)HEL{wfF-RKyq2(%aO>Gx78zZVDWEOA*bsaJksw4~oJQ+9F&ec83`pL*h!HB2~ zHqOqD`-wzc?U@LFZJ?~6Rz7j&djinAo|LS=it^zz6^lSt;O}ig0IJU{B6Cg5BChs0 z^GDk^@ZQaSTf__@W$Rek&>=-+Bp?D9DTol&w+9Q%gMdNC#U9B(gpBK}J(GcgGpbLq zvX2MY6Ty5 zULrC=I@VDpsIzKf_qwEb5=J^2pJw(g?hn_Jt>C6DV|HiFgy~qqnTW__KuR2z5tpg) zosxU%9Qws&leAY3Cr~)3ghYgp6_|qJ6aC z1yE2{fy!tDmk}~M8MefbAu2ka#`-#p}d@)hFfzJ#|v!L@~a-S6| z@W}L%3a|p}Tx#b;u+$Q}*V6G_qJ=pd9PWay?P(I+JIK7`C}m2XvLsV?JFT(;tQO8QO_IW3uBBMEJMMf4cndLi!1kZ^tL!SDa|d z-IZw>=*h_BN^YI4b%^dFDgDLB2b(_ft$H0PYfaf1@34SC1Nrn zVyqYqdIB;s#`7aFQljD_5q@Lo+l=x?_vG7Tdx{y?q)0%@mt@TTZ9*i#cYbrvRer~1 zE@gZwufD`)?Zvh-GMFWFV}&123)#+^S%bf3F2R#hB?OVch(PTzQZpCT+1z!4b=fMq z`-s?>-&-Jy@XuBHxEqfR>T`H67qUsNJYAwNlE0e+;CNh)4z^2NA*c4#+af)?l`_k1*ptdSH+- z%Kn{b4ahAiYv?Q>I&O-&A7mM*?-l_AomJC}n=*Tx-QGGPA%l!T09vkA_9I>{G<%~$ zX9(!Jqf}3wV{r9MhY&Qg$3Xn-kJeBn!OJ&tm5|bBS4R~+z-MM-gwHLM**pG=k)h;a z3BJwha<#I=u9BgYe@ogiP>yn>P_rxELrP$7gI%+vmZ)q4hh${4lPRw2epFiq@>oXK zX12bMi0(;Q26}HKW({VVh^!A^?pOzV4z-2)Q*{uXLqB!TcgVGNf^k;$m&!Z>^iG|KzD$%`;P2d#eh{329)Af6h5^|ikKN>hYVKVy{_K#=qPB9 z*}nOzY4*J;DcxsR&{61$t7(y7wm#6+U|(rtFW1z$-`O8cVXObAx3!Dg1A8iSnt*}5 zl(Ew8s|Z?A-m>B&UOg*c-QOxUS2)Aj74xcK{l*(_yz#~xr^V%dzuV<@$z8EKJVwi14tmu$;YVYIOTl zfBsJZT&J_>3`FTvaXd7*X$v?Vj{xYT(>?b;rcMu8Sa=`*C#*NV^i{L4fJ<*0>Dvb9 zuDiHrugVU*I_l?|zJ&e5dnml6y4m0V``zr6XX#&AaUB*t0T%p{9AwEi9TsIhvs<7W z7CnaHzW=^^fYQ|&5bxmqZnv<8&E{~$SZi)t985lL`KP?VQ%rZSy(UItQLOf!qJ!AZ z1d3Gb?)t#|%7Ck$FfMh+ZXvPTi5wDA_U^mE253ZR2JTXY82RfD=O5V~x!(V)F}xNuC1bH=vp-Eg!IHNG!9|n%LQYGff!DB$O%36g zUAHglf#C3cjl6^p-7K)fiCLRkVL}VMv2PM!`NDpZPO9&0!Pf{9?sAaFq zjrf)u54tU+c+%@C~|uV_FQ;v4rVrD@6NVzuD#H=`!oF}$o=nv2_a73nIim)>TZ%oC_johd6p#*~U^lX+it zXWhy_ad5GsumT!IR>KLamLk;P{3N;F0WS}>=^1qhkkSyY?c)ygeyEci0CqA?)ZhCC z{-Oolz(-}_QmTFk)@*;SoZ^OI#?%{Nyj4G{fM{qKnUw_oj>nD911j^^Y@u4S0Jw8$ z<1`cxj?B7juimwCaNb$Wy(d3%Y|uf?(AGhJF{Dt=O$LWHcR`%-z!qV13s+?<$D*Le z;Ka>2?=}RZubxr}-y=jc-Oa)UlLQB@U!2<6WTctdV+p%^*EPRVK7A z8^+Cf9}CLz+L!*3L!8LMbHDI_*(+e5Dq+USIHl6S?u3PaOfK13)4x)a?+Ng$~{ zF1UF{>Pfl9VvssVjB-8zd}Z^tS++ah>of@Tr3uDt;Y&eX3J`RrS1}s*tlS6v)0Fnq ziIG2Xsfa?2Nqr^E?l{{}tVL3Nd1toyhdZwsT1=`_JpUSM({v2-OOD#1p&t*{3bwAF zm5;*f5E=%;Q2V(CtER!nII-9V7h9E09j@=q{4MH; z$SDo1Oizyf(hTSO<`ZA+uS}NTfz<6&8u*R-%}0%q1N_!bEuzKkvwYT^^q#e`q}0$V z_d?bDPj^DHS#|70nhwY%8`b_aVHhq3y0@+IMB=APJD6J-nHd zKHEC<-u1{`ViqkHHiYYw8fup&pGSH=Q@Y@_T0D|;D>KvH=^K)*_V*7xf@I&vXRZlS zIS0HbElt~bDpG26T?1Ok+vuNgwm2Ns#W9qA;-`V zSPJWSwdHO^hX-3;yXJ|ATc$+Y)1P8GaIu}R(bWJCNBxyslB$C_)3@^;Adr0NOb^KY z3tJ_$R_F^ybY}Y4U#OK=Dp10+>|hSv>(s zZ{!0ied-5%1S-W?%)cl+*1c0pbx^?*G4U`G4N%pC@ToRcj-vX@?>DY|nUI@#_$a*I zH{*@6trAuugvBXsiY^qP$4JX%x1`G<;ZD?VZE~9{0(nn5tHvdq6I41m?2q_W z-$9~ZLKk8WpJDP^#5kK60o6;78oimy6_v2)yX8f_(%RcESas-&%q_;xhr(-8Y}?%)m-!wI`N=d*Me7Po{* z(@5ve;P)DxxbdY0`Y7>aU*=Fu-v$D9)qMj zqNQc))9{)G5jBpg%{9{NgX3bg%@o8P#XXMWh7R` zMZCV=rzAVtt4M8)!MI(|It~uUkzXB|>?w@zm1^2ziFyo^DY33|!v7DhPk?E*aKi-F zoDQ6l;Z$ohpB5CU?TbifvK57zIWU}$vE&o}x&`Hm7Pe?unZ zmc#g?&@WiE$iYFuZnbp_*BiyfvFO`ll4o`0JW01!tZAbCirgO}k{l&BnwxsN1v*X{$a>BQFaBt!C$qyVl%0R3 zqMsOB0BMIH2PU`OmXca2}Uj$tr4*PXa z3^h6pwjKX2;JQ5Iu1w6fc1~Go3b_%?isK7&C8~sQuN@}G+ofL_N#53=!D1K-fpK4x z2G~t|JT>*Shm9GGhI>?>C43w)x*p;5*lOtezd!lY!EePizm5f9*{!EE@{fN$8|wFc zJbo__{`umE_w@_6TQG+-0!}Va-JmB`>B!#FjltyKB&10f4B>j-iaF@WhdG12T2Tre z=E`Ab6st6B!A)Dc)=bQ4Q9?fhuGAi>4YKOn-Kkl6@sX%fwW~@0Q?nsbzrCU&n>cqw z*yL2c*qFFLtVho&jK5demToL&sHBO~9JLp5)oqU}^MKd_`MbU`Zs+Vu_V5$?Wiy^> zb>~~)UBOf8p_fgN`@i#R=!;YG&FuRwQRc+oebjY2WCn9(8F~awu(}8I<`w}RaU^>2f z->p*{Vz2FU` zebr9X^j_e$GeHX2+fmIC3yMLrV3(bi-ooeO(^&$2(_PL()5&)Q3S)aWc>G*p50{rq zNPWoXP`r6m{!;I(j#JQtu{x0G^O~+xLQA`^K7fo{dm6vi%5tG!e5C}l!SCl=^?uZc zcmkiDNVYJ^0c&|Z%aWFWyzqO}vnHk9Dc%@e?gMEBONC|V3ucDIxGy7ysGdhPn+q6h zyY;m5LxmLbzX@^@*(w#gtLx5wCO^;0ZBp|aU9rBn$fI2)Prujc+{u&0(pyTK2H{B` zF4E=mf)cs`(>-3Ae2_pfdYClo3=|I%Y5dqCd=K;=bSWGHO!A7rJdWIQ!PO`&!VGZS zo_eAZXPI#eqR?_;(qMOD_Nu|6uVmNl&j{nq4+l5KA#L~Yr22g$5U8Szdk~lFr%l^CU8*=?6;)zV@(v_gGBEgX3B8(r@0~=moNW8YN`+&L!}}4N?t6 z$RvsI;_5k=8A0g55RjbeQ zutHFyfha!Z;pgjBocamHe_}rn@CAtEV(rOAU8Ao_zXsJk32Iis2lK{0S5o&^%Kg$+ z2H(AvCow4XZzD9dPJK2S(w>CmD?oZuMw6Pv3&ZiMpxL9bUXm+^cJ|sBfXTk&P8e_H z65*Y_aF|~eF%%vKi@VGstz2FA5YFz?BZXglk+tag!jQ;Ao%U=5E=sg^wF9eZX=MaTkX@xR%ik-b|V- zqOMsva|kBkCx7n)P_(Wt*MQMdc=`mOQpF5cf~gr8mb_lvu{c~zBK$1=^$?DIcj#Ck zgK_X?hrkX+3{p2GtP0%O7R-U*_IWg6<~k}FJ`I(WEZgF9Yk7+CqNR&hh7u%gmd!)G zhu`C6^Li)w@6_df1EpI?6#v`J(s<3DMljzk$TfUHNnZe+yFnvPQ4|+vo z@5p$QO7b`d_#bki3Y4&QoELSFX)XzUhvw*uCN>+=Q)g)LA8MiLKODx26rN-imm!wc zzA5R&1GUPqiymP6h_grUqKOLUJu7YA#t&n%!GprQ%U%hC{AJ*oqFrKl6Ipsk7^=8u zXFtf0(8DURd(M`+I@`J-=)kw^k|=}^`P-!`t#STL25lFk{LI=x#4{V5=H-NoDWNUh z1!}8!Ak|~>rg@=!MbJNdf{vji@zj@RZxd#`@}3y}78+fRH{4AdE>H7GnJn55^*ZlD z6a6@Vb5|f-{QFFKtAQQ}7_n!pXd&b|MHGQTwe8mlKkHPD#HDKyk8C_m>noElF6iF)5g3<~hT<%z_7!$`;`Q zhbL7bkHretB;hy?C+sCjSn?Y2(`u!cR<=%x^tLf#Z8>D!v6FzuPAgH45JT;sISB0L z&^`c=*T^UFUaeo6JJ$pQ^$5qojC^({yzs#z5N3{&X;{D0qjsT_uble94LMSDct93p znw7D?nyfk8zu)byHOnBs37Fq2zR8f;Y1jLxzn`n0##u__^dNuz#3v-2fikiHr`n9+ z6i3F4o z7Asfg%28b}sh?%fCTReG`o@_etqUXE^GmA%F5~m1GKM^_)`JL-r%7vcC(K_a*T+A2 z**QvjL{$k=9-&9&MGHe){$6yD2ib#WTY+aK86g5a_VYPLZSne%icj4+LR3MLSyz=AR3wi;9;isVUs)Z*WM&k1x@T&|gjyk+S+FB0bbhM^8lE z|AMrmBUhK&XOI>=*uOGwjgkCQdOOSl&3T6TywnD921lzQlyXEWGQ#*X`7kjN7HU7|r+0s}Ye_a5bR?UX1o~jwkAR3~lfsOQfuk6Vfist@o zuPxNPBbOID{w-?$oJJF05aE#c$-j_VB$hhDbAHLys$vId;F16&*FmLa9R~PJ^0ncG zUX9eK6VOCWlTO5=t5XiwqI%Aqr%Vh6 zCGo3!!uz;ktm)Y&AaT z$ohdpscXAn1o39T^wXP0L$y!ARu{!(4A3d!M8bBeWp zYyS>j&*aw>e}*`S$6FDrk7D@|dI9ogid@}_vGi-5=cbR1pDtU6yfp8!(~HcGmntH9xPC9e$VD+N!TX7 zDim=N#|I@?2XVMyAuM08M7Gq%DI_%9@A{AWSd3&NfApM7X2E?gdf2u-UMa@z#w;JK zfXUOJFC)tk*YnM4L>^FF_-5!P;fjo!Q`+c>Qoz^2Zh*ZDV?qkrNIqB39v1ipd8Go= zY`T^ms}yW6?4sMr;ase1a24vf*Ek@#1DPrxc*xQR@Xj;3GHfTNUna-*v6sVq;t6Ku zk7OSJH7Xp!2`@bK?2S=>NKmq5Ozgw?zm>{giaj7F;K5gsJw`C^{vc_BUG*tV!}5$EUQ49`51Svjr~7cTUyXBBehTDHcyGKBOnTKvV08e$O5to+ zuW*i%*F>*?k3HYBm+Ii|hpV#LH{Y7@cgTl`Iy*$SP?%GfRsWY)J-)>bc;_iu@FwVtme&;C9 zndG!K>5==3S*WmaVIbL;$#4l*+wg5Yk6ZiLnz~o&R_-!0sY&~*_0aYH1&4nd{eohY zY6R(lgjrenw<5KmJWHjB$8y&eVq=TqH_;pawM=HossHD~ vyW_vkiiAY%b^{(feXOwNEZT8u_`|sr+OcMLUIKaA#bLQ=Y++PmfQ - - - + android:layout_height="match_parent"> + + android:layout_height="match_parent" + android:layout_weight="1" + android:layout_width="0dip" + android:gravity="center"> - - + android:layout_marginBottom="24dip"> + + + + + + + + + + + + + - - + android:layout_width="330dip" + android:layout_height="wrap_content"> + + + +