From f62d964332d7166a6764da93b2b0242c46e4860c Mon Sep 17 00:00:00 2001 From: akwizgran <akwizgran@users.sourceforge.net> Date: Wed, 5 Feb 2014 12:36:40 +0000 Subject: [PATCH] Show logo in splash screen. --- .../res/drawable/briar_logo_large.png | Bin 0 -> 11146 bytes .../android/SplashScreenActivity.java | 16 +++++++++++----- .../briarproject/android/util/LayoutUtils.java | 17 +++++++++++++---- 3 files changed, 24 insertions(+), 9 deletions(-) create mode 100644 briar-android/res/drawable/briar_logo_large.png diff --git a/briar-android/res/drawable/briar_logo_large.png b/briar-android/res/drawable/briar_logo_large.png new file mode 100644 index 0000000000000000000000000000000000000000..1857c9df8187458cbe88180aff0949bc953f7dc4 GIT binary patch literal 11146 zcmd^lcT`i`x9(1d5JKn)1PIa*loB)`C7~C=$WcIS6v0RlP(&1zgiw`U6dMFVL4Oud zP(+Rd5&;Vu5Jfp4RqPN%1r_10aL(_(G2Wl=-S@_O<2nYzjqbJ9TyuVF&ToEeXES}= zWU*>k2!doi+?{<P2!;ngfl_GjFVoj<I)lHEyBXdL2)f?27Io}B_?;B*5)l7KOnCgk z;C*2bV^>T_7{wzxcz2j@Sn#exaSy_5A!sGp!<n%uaUf)2X~{ugNJLcyDHXsWc-9`O zlxrLKy&BGj)J$p1&$@{Jz2^{;Ec`O$s?e9W>MTiiNm~wrvl>Py8UawfEa5MBJx=L( zA#cfu(25+x(36Q-`OwU%o*+FncS^cLRyZnTyTaEcXe^SxpkcJYm>*|}6u=Bwaq({q z8GJcm8~qbXxJWgQVq_n(CQPHpqN}ork--|$xd>&oS8)ni{f>gA53GW53<RSF#*Uyr z(6`A5dk{f$QIu<#v9~(3g;(q*WY$e~!09ImTF5bJdP^`>J?QV(gJOc?5pf@&yNEvQ zDYUSZz7UyqpJ78#h3Y$?yP<N_1-H9JEQrE(mBDW!Kte@Mz+S?g_xgn0@R>z<!eSuZ zRwL^(`qW(;PE!aqi2~7~T%XPrP;F`b(E??)x>e8YDc3Y7N44aHC(*%`F!&o>0cX>> zo+vmBm^&~Q6vWJUvG1A_|LSbz)%*&93H~9k@n;Z*Hx;VXkV@*2tbDjFSW1}5F54}2 z=a6ZGIMHtX7(|sCG!qWuuuCKz>v0Gva$iMzNupG}ovdd4{Q1#JFf^A$+}k?zMEv8e zWyaIia?brMRLdt{+~Ae-xCQbJT;TaO95(ek?$hIz2_;Q!0R@lcH05vdo*SOVbhZ`e z8;}-%FLjGQe6%|M?S@&LSyt>N?j9G08~T8}mRSXEL|VAcHDVGb#Vgzv`xr6i?5psx z$L&wt2K#f>%}#Xbmwxwh7{~h4l%jco&2dth4z&+jO9Jlm9MzN-*ADLuo?rZ>u~`Fd zEbP8;lZ4Y9CzcVnWIz9o%KAq42-OYO1c1DRa<fP5Dlex%&%=LBuVu^N0};&6Z+Xl| zl&(w8S5EM>2Zqtz<!rR$DQTmHA9I$1?9O7MkHfh(@!Mg!(>7S8DV`W}A5j=&KuF3F z;*bQoPW=e9`D0D?#>C0@CK*Tgj)*?;MODbE^3Uh`=B#6Ag{lR;h8Iaz!ZE1NMVFTJ zW$~9?#%6z=HmV)W@Dn2rIwrFMV%_>zbamJYU|}{2Q+qu)V*{*~_cHEo*=X;hH;761 z$U7lHbLq7g5Fd#Yudz(5J9^Ao7%#ha+XnP)8XE2{erJh{G==AT$U{#n)920<mSltT zQmst3rrVw>IRC9*k+k>TD+{r=&U-3a^@3kWNg!-yrn2BQdwvCi<GttL@aN!wB-6ZW zrgl-#CYCN~YWK)4<rUTOFog7Ym;fdLLm-6qY}k^fq;d46xgl0Iz(2doZ^JJ_HrLZJ zz2i*GTGFk-hniwX1d@)p;j9uQjVnk$tb>+}G^VYf5BVo!=_oX7;;0#ndGh`JlgHCa zURlylJd%5#s@`V`JFubFF49pN>OTLu*=f^B^GID~G5~WC7QfmtJE4E*2IDR3WulBc zKTb+%F!A7>^1~L&gJZ;~k@n**LZ#Px=#Q;@Efm2)DM>|a`fGH%*#X?kUP_p@D)4g8 zjuh|M7YFL(3Yrx@sIZ&ExytN|6VedgvGiFi9IWDt#iy`@V^PuD67R8?Nh5r2xZ{y% zX7n|?tUuYeU63DE;QMe`^O4a^9pRNXabzPDW_cw6x?<wbgGuNE=TV$|2TiWxYQ04= z9kSW65w^3<+xd6|Gk!}3YyJ-n;00D247v7ol$t_0CFE9TxM9W;cMgL&(k2VPJv^n` za9FvaoExLN%Mf5d8ijc$Wph^j6}>x!*{*>dS;VAzhyBI)5Z^L&cz&j<Kq`e9sD1wV z?sf1lN(f*{TB?&=g)VFLLuT#gpdn@W-qPJ{@)6ogwz>TS)r!^lQ$lCqr(-kjhBSZ* zT_y76dENJa%BA{>Pl)3$yr9J2Qb|9m=A1s~<mjp7=GX=UsID9#bQ)L()C9$GDpI6w z<)OD~sZ*8n=J<t`y<>=)lf&1IJYxhXNq7xuV$C}7L4rxN=A^Vgv0@@9P|p)LKex16 zTTf@K$P(<x?n<JPNUe@pChyipK`!UioYakG0LT9gp9|dXaPzt`Lq^zU3%Phzsdv4a zK58#@?Aym0<g;cmg-HQ!0rT8z>ULgEv#p33E5jqiEXG0Kd%W8QFnCru00-XRfs&9G z(%nXQWD^pM`vP}*TNHN`Zw<mn6c6GYuq-^ilqaA2xh|vk5c4OVz+I*C8YSeZ_oeg< z6hkoQ{8Rx1iWjXgn6Sf7(5;W{s0vcT1@qwdFVPn;S*nN`D#hMur3_f_L@2q4-U82h z>SQOhP-_M6i7u$ZE>~}Gnyt_^HGxS{0+q=Z=*iMq0=MxvrJPh4VpNnI;1bORg9m`I z7pFAngDByOs+l!d*ETkSX&;q7>E#kZ!V>6xCbYAa7tZ`*ZOa94c*kBxO*zaIn6aVr zer@t{!X!|is7EDyq5&##xQ&RzUO>Z;1S_-&!!#FF9r1H^8Y6giy^~aa)cT3|<FIPR zoI?!a{?R<w&t`~9<1?-$DLaqe<;T9;qS5_$cW}sV!Y+SQFB#W6cmj9B_EylE?4UJ> zU7tHu_6-5dm#C0=_RrA1)WM~OGou~9p5yXc$!JwgiE9j?%gCK6t?U0-SDupo_{NUI zmRj3bY^<CWhmH<Ay1_SROE<K|IIfty7D5s(pgQA2?i#FaJ-3_orG>OUUjp@71if^1 ztpz$bZj}>S{Xw9aH*$nMxzk|ZCzKS$vx7$e!xo8gT>8C)h-!XrdF4-aY9I@o5&E;e zy@z7$*NGdjXQ#6up7LP##7h)`KA}SP#5q5fU7G(@9z6S-ma#HMHMipfU}5p_{@13v zUnV*fjs8`!R=5Ug@MuI(*j=Wy0e0CLW+lw{HyyzPo63Rzgo|ih19v$>B~6|M@7$(Y z5VEtWf;0~Q7?Wwa=dB<rBi}(Qr(*<6i$K~h9d57t9js<vOt?pnay#}40LiDV(8V3b zvWaN8U=E_oM~Ip_+iIMz(hS}kqS?@j#*vW_b`-Bo8sz@kd@JyZA(1>XnfVPT=P+$h zZ6cMWmu00$VY{2s7Nm`6Gv|}27bWlP8WA2}6;k3th}5J*g@Lh6W5q4M;(om=`3Owm z5?X%8AqKxtpusFFx#hv+8IQb#jgpZqP(yDCMEPlG3zokyQV`7FudBhj^!Xk8on)vg z`$W59+4~7p$dQo8a48B%{Vf-I#-C<pZ@((Rry-Fdo`0n6=oyu5jsa5}(Zp)=Uq5E| z1dssVEkKB-w!`^niTeSW?7N2b5r3PT{pY{9a;=&K-}9b1*1#{GZJfEI3M=~WFUKBD zAZ%=VL<q%$TzzYqA2Zllaqj0=iT<|053504URz&6&8G7-mZ>#vnezTkv;Pa9vr1CO z741FzCVL`7-N1g0z?xv2ug8iff>g+|-2kg->yhwM-RcQx^GN__BUEQ}auGZVTUBoX ztfXL)qmXlTc9ahCvWIEe8+^|`3ZnW+oHs!)dQ?(SBoLM%2=r<ta-wX>n|k%!(&b4D zChNhZQvaURg|e9ARaCK^!zgnKrG`s}SJMl&moha`+kYfv5N}F+{63)NLg794Ue+f` z!Eoo?V(M;gHljdab`|nnvBza;WU5yqnBKK*1l|&5fwO6^Pb>Ls@In&)#*u*I{bsHz zXqoKZo&YsT0AVsS7O{)Ekl(+NWs4r`o>wyba>t@;)+Vo`PXZET*O!+Twb*$D-&^Wg z(~6P$0E0Itk~OtaQ~RE|-ZhbA1UU3C^V&Ye?2R_LO8b}3O(=peEv#XuXLH-!f?vOj z=#^}m!2VK^xv(kZ%P50&PhSnV^Uj$;V<{s@wj=Fwlv?y5$+jS<WGS_@U;fOJv4@q` z@>!+#GrSER&KQ4m?X(4+;pr4i-a`5h@ESKevtQBIf4T4!pzOh|pC*)h&hGN+igMhw zb$^XfhSm%m06=ADKqdX3s?|sfr6=Ui^k0L;>02j&%qf$;7qz8XweQ@DYNnT=Ld%o! zfxB;TYaOm&hR@nb5Xken?d(s(pY5clW3qqDt+q~pFXuCJiVu41g7cORVH?k&NUCG! z(bk}*xwv(LGg|$m*NaVU;_0Orv*juHvUIPGQ^YN#w3nON+vQ!*hjw7l8-2F#%Q=P~ zbDC%dxhSA^<YXAGASvvZdyi0H3|mE)1mA~#qBBF=Yi=><V7NSWxJVYnKhO>H-N~!2 zwaQ~RC@l<G-^w4QD?sr3Z1*c|O67ciu~RMgjKt3xkcRLLT)4kBm`H~<{;CTRm1Wu^ z<o{?~PIS#26#YskbgGMog+ReNw-0~%@;7K~e^uOaO@fK~^jO7Mme~x(N)`=X*pUwf zp4f{MR^kd|seh+RNTl$^ko7S|#?%B%p<<I5BCF&D)jJR{2+)!4&+C{5$k~M8S#oZh z)AQ~%c}6}0_NV7*Cc%W3m1VF2wfgiE$9RjXD+wQa?HVf9hrLW`4eqMOYkj+f16920 z)vjF!9gbSk{f?xfZ5cHQ8k}Q2vH&lSAT)oAp({FvT8D|h!F(&_834LX7U2%2uQz#3 zYP(jS>A{-HA4?dngdT(ypnfims)^$9f+c~iPo^Uo7YY1Tb+9u}Qic9o60X45|7Xdj z&_ZgECnvl@k6N!YYw8+s)&_3=ma<Py>ou}V*cL<~IqZV_r+J+#P#{r!YU(Xl!DeD8 z_Lj_15L3j)*fOYoCE+i+`7rB;_vQlVz7xFerr08}_A9PN+>ab1#oze2j-bUE+fGkT z-BFH|q8wHxYtuiWfdFDcJ$)Obe;#%u&99v@C?%X`Cz>`8wm5km2QYdOO7;=;###|- z@>JBo0T3xkF=k1It>;i<P~aBO_BI&PsyT^@glSaB$DVmINI6q{sjPm)%wCFL<*iYW zoQ|jJ<iIQv$JePHl;lfVEN9Z~avmLlBs9w89j5HC9?+ANR3=Om&;_ULtvSH~gRZ7J zmB1{B&&<@^B!dE(Frhj-pvadi$ptr!pOGk*`nufP4tvcOel49D{WiCfDs2>u_eRI9 z;>s6WlpnQg6VJT;-D6^r!!gT5BNTOHxP~>WtOtHq#uErjI{mU>k=)c!xKVmXMT!Ga zGsXIG?DTko+3(L!)lZ{uRI&!LjA?sYc6P_k{%-CWw1PvJn-s3?bp%(T)qrb~Z<=VX zA)St?y<w14sRlAlU~CC2&fX~dXWt|HjMc3>b2@&4JfM`Sl`?EOxKO8=!${9Ml?daW zU@A3PIU?N=V{Y_8&%7aE#seaTb-J;bm@XlT0f+u74jwMP(c>5jh?$!5ip=uomL{#A zv7fGK8u)FMA*?G1)dFQ`Ypj{$85`$Dix<N(i2Sf+V6$ZG7nAvQKaP?GrMHh~J%>N+ zjH(_01sIS-UN;Kq7M^Dt1HWwn)E7&&DoHe@*<aLazros_Az8|l{&PI2l{F(Hm@yN_ zW2;(Db;rK%Ug!w`K@DO<wa?=wpYIAO31`e&NtB~5BN~=XoECo;JpDz=vx`yBy(7uL zM7F-p)X_m7cM^-*n6_LI`%<}u%t!=v{?4zBuUR<~hVRaQZQz2dNU_tt_?+=I0CdrS z+p%9nW{v(4`}L5b;CjkV*U(5wriarbYv|*-NHzf>{jpxc1X2a^pvRp|%L?xS9<E|P z8Ck3u5<ZTyQTT@=z8ooTnGb)>!Y!}VmfnA})-QIMzhK^FIoKt4S0+_m&6OBy+VpGB zy2@ar=#GYhune$iz*KI{>oWfJ+_iI!q!hJ4o9;OLc8uM8N!C0Z)J@Rvzkb%vc=S+0 zm{44GLOprt#4-siNp(`LnCRRo=NcL&u^az-smaMbTmK)DlS#9G5YsxG)A3L;j-34S zcUgggOUPr;HUZ{IN-o;DXsh)PJ(~Z0a)hS4agGcYymZsJgvJ6BZZumjk^f$6tdo>y z3TatMkWlUa(q{?Bi)lfd-^j_B1cvG$m)+L6F1hH_V|Z1iHCT^=x$@XHtt5HHKeUgZ zRBWzw<`e6R#Kta|*1t?#evr{1P=H>l*?TY&p8qFh_MSuX_5Rs&o?u=#>`?T-y;Xh4 z#OUE$GYOqjBD;w_JolZls576*>3A&hmlFF+4fVF(|Cm_uUO0~B=i+1-Pfd`-shXZW zT+B(Ap4Q9h=ggZf$Li8YTEciSmEfT>Q3rzU+6F<)`+JRD#Toa13r}N~iDTj!bK5Hl zxWnxpRrM0)O+f(Khy(O-(@G$b0IY@T5XS93_qm%CbB??0`nxC5WplR_v^krcEV$uM zZ#fZQ3G!rL>bL`8gP;bYLgPjbkqwWQ8S?w{O^-I9R5g)&Dr-?63!G`4wD}_3{I!?i z{X00)rwf0%hDL+n!q5r6-onS#?8EXy)nzi^z$%ej*@<v%mk)3bZcWjFs-ytPHYq`R zTkiAplss~LnUUk_M&Tfd-nknJ<YFVoV_%&WNG-~fx!0y8ry>ucu7}iCnGrnnTz^<o zrVJ#9`~0r0NA%5)?K%`ia@@Rz`(EM}STwA5tHR|Q*^I)crI&vYfks8p1L9-#LmgLb zhr4j@^|2LZ`XN^rKp?8v&d@`D-ol&f4LK!8LS2Mk$#pO=Z9EiWftWadQ6*%n*68KG z+Eh0U|86=ry7+bor<Gz)%>4!y>VkL&NMBlfa1R$Wg*f(kZuq`tLrK8<h<Bn;A);Wi zo-hLHZf2XY#FI~3wQ$oZufylRP0M&=<%99v@}*@|q!UT^&U)AV&&^hu(8^HktBEe2 z9e4wHoQB>M;9?Qphe{mZD->z)g>96Fmt>|Za^ar8npA>p!7j@ktJuCyAf~5x=cQuv zzw{(ZijF8%Eka36(na*yUulxbI>(-$WRWF#gT=R_BxK@OGJ&*3F!iy<M3?j+#$Hv; zNP1T`7bRL~I(|9>km9S?+@Pzgyb&Ry!H<(YP3pi&Q$d#0B|Z3ze}p<7RLFb&sJ^fn zM2I!ItK{>yzl&t}2#hcXueYEM_e6DpZ2GRTaKfC>?^v%UDdQ~bOAlGepk<`1Bz8g8 zI$x!fc3wDnAA(T{>qL7QGq#2mGFgp8ip&F6+@@xA0w%Z4{&O~CLX+8&Fj}+#WO>0N zCf7+n)}^VBw7yzA1%owSHt22I46}JXy@rrNu8oDHcx`nDlp9t~<4XR_ca=T}bXH#5 zdlzn(ox(g8FM{)Bo~q(c@i!~Q>u!p*4Q5BdHD3H*=t{xm&VPBQ`@b@02>VoFX+hC2 z_wj?_8IK!g`*U1B5G0DF0yb~MyzZ+liJ2w4X#q$nqeE+}+ba&S(jDFv#d~5Oj)I#o ziMG0W#$(^jV|b&du{X07eZPbhSpRS!w6;&zR4QVet52Q;$|{IKAv1QHz(Bg$Ak+}1 z?W5=DxmV6{_xOQgN@j0?bV^$#X>pU}E(t8Ubw0wD=}0uTDkt7nsl50l4BcgC#g!#@ z7#KZ@vEHRnY|?72t>@<Yw`?00s}$3|S#?HTp&Z(dcFuOd5JtM!W8vSORxB{a%@u5a zrj?x2kS1Y)&HyxuwWF7@cjTluu#Tt8J|CEpsti1Pa(jd*v-Kj2f>2!Ca<v%TUHvUe zo6^|y9sF>S!8Vfp{#gI8EWj<+`K%sYpT>X8(mh3Mvcz`f`aY-{QZkh6&o`Dmb@2#$ z^~N%<-Et9fG$Sj5FTDBF{0!xL``+ZDi@hXnv-pL)4Cx_i?Q<BYaMh@wGhz=l4?X+< zNd;U8p^bJZIzCj9d*i3Y67~Dt3t`%vb-!(g8q3wuvxF_*DtuRrIQDbT;}zi?x$Q7k zN2klBQsRYY=tJ`{&{$Pk#DOsFlWqM2e?(C(S|PDZOaD1eN`D*kk3Ow{MBK&Gs{$hB z&9f7X;>p2v+&yX77_G)j+{<rvQ{>$qzeKZ|Q$9#N^umEq^nSnmmEg-W{`6p^_NAF2 z`D5jP*Lu}A7{W<>p?Ifjt$1>ma)^}Z>^j32FW47bhc?+{nGziGs&fEY&RJSo(h3g4 z2=Ekr+S1`S&y6#pZ)1szziXDt%|(Y{%-h*r;YnHqRk=#B95nVVP3g$OOj+>fMq-Bl z&g-&SI^TpkZK$=1qu%Lj*~EsX@qYJ*&JuXY;9byNeH1zEbZ|+wD<H+LaP;H#{`mc5 zhfEWv+VA^9&U{p5zl?2Cd7ZNOJLqMyW%20b8Pl(ksR$XYs4OEpUadYbnUna){n0<u z5wcSAWC%!yrK91rnM4J_o!$G}q5@$|#Ua0IIc;={ys|(%njYD>0r$3D9XZuH{IqWA zD586-7Vp(cOnP9*_bNVAtM!Mqf+YdOv@aEbyv%7z54b;^(i%#ejZ$g)o;3Se|2Y{J z*pBn8<H2YOx69tbW+t@Bi+*Vx>*@|@U2okXXX1|cy(%NE=Cx5J9(K#jB5O+x2bTb^ z?{x3B1=}u?!4t|L;g9MF__x;Sl$TG%W3w)?aQzGVNM)t<>#qa_ZseB_x@@qb58B|` zE8d;ZI;@KB!yfwngWN<<SsK?AJarH@q8Zy6J}TN~vIE;NfrVb^dAJ%HW|iR@(IL5k z+!0%_JrPG?rK^wys0sK?wf4jgX62}?Fw=G4MessT6@o;>vYUdlni`YKl+|#eDL)!w zSKy&Kgy_a0Zs86VTf*CJ(K1}S=P+58oWv()_!QA6Q9NahR`nF(D$H1;Tb}?bP!$Se zY?i9O<0fO`B3I-%{!=QOyMyus7IKR*R=!RI4;8S!(;;w)^7%3^b-ze$H5az;^b7i3 zJwld-E0A;Hy!%l+PG>jb6Q0>G-O%Kd(jekXGS<KtUvUlnEK;~dbVBM+h;>Y%A??sB zmXg^^hQQ%$Uc$Z93<s8IVVtED^!L3r0YjHL(ZYTyn-$Ft$T}9z^|_CZw#LY|aBhXQ z5@q+|_~|N(r>TZl7@e!Gg|W{LSzx6khMCg35WG^yTl6TL@QUc7RXr51|0c#z*7M43 zH*WDR3Qjg<zu{KptRGo@zo4vP$M*t}V-i)dK<a-IIOAjEC5)GD0TM`0D(Hj$|9YmV zL=fA%y52$6-{lIl=&Gwz*dc^p+9mhsVM!lI=<kcA2=}i}hQHYl6WC)Sm_JpHUBS3L zfFV@+5Y(2wq7kR23ZE^as;P`k%{5=4)oci^PB+Rxk1R1V82z)|m=Kh)3YpuT|CU5i z^^|7TkMP4(|Kvc@qf9e8>0sT(Uq>C^m-pJr5$J+D|AJ$ikkxSKAmYy+=(PKkT+n2t zvO9$ly})`4(;HHyC{w5&a{wj29W(`A<0Zb?w+e__h%;~~@+A`KGlp~&O5|tsT!03Z zqIaYg)^OMSEC&(4Er=#mzLb5W;W_6n%JCZ(1=PHEBVr7$PfO^8SMu#Jqw9&C)tWGC z-0z!7Exd<JDe9SfBF7PV>!FCvD)<!+B8wqG;3>3jEo!r2Uf&HeAVKCd&-_5ml1p%2 zC@Bq{|MNiuVtAw$p%EDpFsoRhHC((!fIHFF^DA*dncbNSi%)n<uSp6R*uYl7rS;xJ zG=8z8L$W7R5q6ZBuq(funnvhom?+1&J5~#a!rV&@w%;VXD&@Ks2ZcF&KXvuz=^8)D z9j72JXB^hx@g26I&4P?3FjTb-#tJtO&o6%I)LAS4V7du=Zqx?yi8^Ub*f4M~h}ZiC z3BZ1hTg78<rSo=a;-L}_e#D59dD;Obj$f;3Mp0SoP0m2+TdjN|jSP%el6(U5<fgIu zOxG(pos?B%SCsBO6#=^8^fws(K-JBa^Uu=kt$>=y8{HO5CTeF-Kvxx|H5j(?LrTN| zc1<1meWZ=%h*7{Lg*6aNNQJ{=X$Ln49bGWPEnMQWlL|;%WkR)2p+xR5Rn{qeaF~E3 z4%g8w#ObA=3toOb%I+MNu6l!h-Mv?-Mh4h2<mb@R#*B!Y7%%*b9<p->o3j{c<GQK& z@8g!pMhGa{D@Tl|v5jQaoCN>aRBi(mgvV7TZ=)Fzy0<<rCgBr8@a}XTO!A$HL{)2p z6uRDBB>YjQn}aru1_@7gE*0UwbE=)yC#S}~9#+TZh$k7z5w5%aSx8`DlPbAMVM5ST zt3~BkJbr;Rzp9WNYEZ?7gFGm>GZM?!S?e1})<WO;g%rmd*b{oZIk4nNn=fuRt-n1( zf$86-3N$zHG>D&zWKZwKUb-q31u0d?b=8IHCOo@Tv<fUiQzc6${uByianC1d_g?Uw z6}ku522rjdquLw11TbKO3K^AX@k|&z>7Q)CkexhH3fDa7K&kQ*_HUm77|BGKK10$W zb6LT9qzxU_Z?sbu*I@S~y3T42GfRoJEp0aH>W)eF61nxB#yh54+z0G9AcH|^OK=*n zB$N+Ck~6Y(%jv@@wFmT!_9(9s76-#K_N*=KqcTdBFMvQg)*#2|ofnB~Ae)!fu|$1B za&S^G;r2DLcd_r-lx$+)nIAgUBkXftUfnN1M-4<fB{CL=SeuCPWM|_9vr%|vrFjLq zag80_{#2;4P&kJs53LOd{uVTUf)wO1wVM~k(AWs9%9y=^H7p=!23N{M-sD;7uXC!n zeGa0_u7mF39IHMV9P=<OzeY4q@4jY3hw9C6JAs6V;lUEv9rA86kSFpdF6)$HNb_zj zqF5`$mN<qQo?(~Vk^-L?z{n_-Kbx;$aSiK!zt+5TcQ2nl$dA#s+PW1W<Lv5l9SQOF zdO9D!Iq~y<8GTae9Y2gro=eeXKENl>ePr(U?qs^p&DARhl}sK2!1TBqiXdi8|E|aI zuHrfwuQLte`A^WsuejImTKK+*w`Je5!0qW70LuK~_|0lWmZj{m7P0h;YX2a9N`PsU zxT`Q&JUvc9(k)$7N#fPFHFJiPlGD+RW5^e8Hu6U^+Jgy8O$$c|r}bIQLlVb~d+)7V z40AvnxXvNxY%iS?U36$XJ>M{O`Rs1q@VDIG@$VF5UtGf)YRZTkuNigEf=z9c!4nPn z<EzqxnX!aVkMQSHoj7!udvp-H^WLn^uAFf@M4pw#-}?cFzHTzvKF{%dIp^?AIT_aA zcC#Q#vgH{#b=<%L_vBK*KD^FF<Tn1Z?UkLU^ANa(a}WLqqS)@&fuaw+w`3l=C<}~C zI*!;`T-q17*KC{3Rp8&N6B9mi&u-k0OM%+2vmXv^21n(q=N#PmR)$RNsc8Uh-N%=s zgo-10r^l;#Y8C}q1EGtQ{kIY2*G3U)FCNbaS_s1aWfv8EQX8=d8$OISzBYpXyA`2` zP{d<UpR$qe$n~~OhQ3J#CPt{wFx#uQ*}*5CXh=7#uT4O&1bikf6|vLkv4gNP248S$ z%X?|5t3v_qp}*XEtu=V<Rj~YIc%um%%y|R)1TWYB%0$aZ$IGD+{DXaMDD;3<OcRIh zs<u}KK661D6>-2{lCzY^S{avG*AU!wxv+V;ph$$uoQ#xGlt9{+!X*Bow;d>6@6y*h zwbE_PvbJiZb;yfNd(Z3p5aHWx4sSO6-d88-PG#~&HwtimW=awJF&U!==dj)RIml%e z(J;c(BN{gzT40@~fa?^I`)ZoKSq?l9mV8DQqwY@3UDYcgYT&aW|D7pc@vnLU&vH1o zGN*7}ASZ!ljlXv2dmL37=WdD*eA7jPXmQ8`{wyr895j3L5k);Jm}oxz`Vb$bGV;D0 zZI*N8uD_w=qap<?ehIJ`X8MnISi)auThnLko?0C|Fd=p|O-W2Wwc0EPpVxaivW)K9 zaY40=Hn6>t3`B=#W*hh)F>&2%&)zkf$L3-XpX`%W?XAsltyUUTN#Z5T;F&`1EduvR ziWyO8H5`kYkNBL+73RvgZq+D}=raA@d-2q$&F`FE)g3@!o%PRRs(Lo`H|aO*PAiA{ z2BP@dm=EDrd9Hd#!5+UhuUivL_(3XR%eYk?r8gUKQEcN}1PyB)FnTbEY7-|ZV|!M* zG15C?o795q;DJNZUjOpzWF1UjFLBYOkwnOp>RJ=D2O&P7sD*1+J1eSBt%|e}OSqwt z0h{ylW=2(d2fK028eDIDJ(M~4?lc}QIfjvKGtg;6x>pX0MB#3)8d4m9CzGPbC<kUc zdZw_4z$*c@WgFGeFIQtKsaI7JG=$@wz#lOYcOtb<ZO1ZI!{GQk`8e)DbR;7Ey~@sJ z2O3}5z<UTNx;dhx<<9|tEW-j;R$+cfbjtr@_g`ozKgxLE*~)jx5cuQa;^TbHF(~yv E01GWVWdHyG literal 0 HcmV?d00001 diff --git a/briar-android/src/org/briarproject/android/SplashScreenActivity.java b/briar-android/src/org/briarproject/android/SplashScreenActivity.java index c071e29821..a01baa441c 100644 --- a/briar-android/src/org/briarproject/android/SplashScreenActivity.java +++ b/briar-android/src/org/briarproject/android/SplashScreenActivity.java @@ -8,14 +8,17 @@ import static org.briarproject.android.util.CommonLayoutParams.MATCH_MATCH; import java.util.logging.Level; import java.util.logging.Logger; +import org.briarproject.R; +import org.briarproject.android.util.LayoutUtils; import org.briarproject.api.db.DatabaseConfig; import roboguice.RoboGuice; import roboguice.activity.RoboSplashActivity; import android.content.Intent; +import android.graphics.Color; import android.os.Bundle; +import android.widget.ImageView; import android.widget.LinearLayout; -import android.widget.ProgressBar; import com.google.inject.Injector; @@ -30,7 +33,7 @@ public class SplashScreenActivity extends RoboSplashActivity { private long start = System.currentTimeMillis(); public SplashScreenActivity() { - minDisplayMs = 0; + minDisplayMs = 500; } @Override @@ -40,9 +43,12 @@ public class SplashScreenActivity extends RoboSplashActivity { LinearLayout layout = new LinearLayout(this); layout.setLayoutParams(MATCH_MATCH); layout.setGravity(CENTER); - ProgressBar spinner = new ProgressBar(this); - spinner.setIndeterminate(true); - layout.addView(spinner); + layout.setBackgroundColor(Color.WHITE); + int pad = LayoutUtils.getLargeItemPadding(this); + ImageView logo = new ImageView(this); + logo.setPadding(pad, pad, pad, pad); + logo.setImageResource(R.drawable.briar_logo_large); + layout.addView(logo); setContentView(layout); } diff --git a/briar-android/src/org/briarproject/android/util/LayoutUtils.java b/briar-android/src/org/briarproject/android/util/LayoutUtils.java index 6a14c9807e..cef095e237 100644 --- a/briar-android/src/org/briarproject/android/util/LayoutUtils.java +++ b/briar-android/src/org/briarproject/android/util/LayoutUtils.java @@ -8,17 +8,26 @@ import android.view.WindowManager; public class LayoutUtils { public static int getSeparatorWidth(Context ctx) { - return Math.max(2, getMaxDisplayDimension(ctx) / 100 - 6); + DisplayMetrics metrics = getDisplayMetrics(ctx); + int percent = Math.max(metrics.widthPixels, metrics.heightPixels) / 100; + return Math.max(2, percent - 6); } public static int getPadding(Context ctx) { - return getMaxDisplayDimension(ctx) / 100 + 7; + DisplayMetrics metrics = getDisplayMetrics(ctx); + int percent = Math.max(metrics.widthPixels, metrics.heightPixels) / 100; + return percent + 7; } - private static int getMaxDisplayDimension(Context ctx) { + public static int getLargeItemPadding(Context ctx) { + DisplayMetrics metrics = getDisplayMetrics(ctx); + return Math.min(metrics.widthPixels, metrics.heightPixels) / 4; + } + + private static DisplayMetrics getDisplayMetrics(Context ctx) { DisplayMetrics metrics = new DisplayMetrics(); WindowManager wm = (WindowManager) ctx.getSystemService(WINDOW_SERVICE); wm.getDefaultDisplay().getMetrics(metrics); - return Math.max(metrics.widthPixels, metrics.heightPixels); + return metrics; } } -- GitLab