From 30becf598993f60ea7993465de074510be19a30e Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Tue, 10 Jul 2012 17:27:14 +0200 Subject: [PATCH] Added paused/running icon for each call --- res/drawable/delete_default.png | Bin 0 -> 2116 bytes res/drawable/delete_over.png | Bin 0 -> 2090 bytes res/drawable/pause_default | Bin 0 -> 1536 bytes res/drawable/pause_over | Bin 0 -> 1531 bytes res/drawable/play_default | Bin 0 -> 2267 bytes res/drawable/play_over | Bin 0 -> 2252 bytes res/layout/active_call.xml | 16 +++++++++++++--- src/org/linphone/AudioCallFragment.java | 8 ++++++++ src/org/linphone/InCallActivity.java | 16 +++++++--------- 9 files changed, 28 insertions(+), 12 deletions(-) create mode 100644 res/drawable/delete_default.png create mode 100644 res/drawable/delete_over.png create mode 100644 res/drawable/pause_default create mode 100644 res/drawable/pause_over create mode 100644 res/drawable/play_default create mode 100644 res/drawable/play_over diff --git a/res/drawable/delete_default.png b/res/drawable/delete_default.png new file mode 100644 index 0000000000000000000000000000000000000000..8c1843de8d4e30161a197b708189b475bd0a6d9c GIT binary patch literal 2116 zcmbVLX;f2Z8onWcL`XDk5fTKv1Q@MCa&PtoP_jZOp_$0B!D($mav?#okc1LYr(tc7 zl8VZzrx3Sd2M4qjwOWBf6&#l^?GJ`=sgydv%$#ax&XjS1xlwTDho?X0JLfz1d%ycW z&+~3yy(%Yz6dDx@002pmDOIE2je$)F0RT+PHqlnppgLt5=N4;$vrK140Fl9(kAMoZ zt`JcpIzxHM7?KJA*aB0o#;H+e3-wkrT^I17yUaEe4FIW|T{fM52jT?tkwTLtjrQY( z0UBsBq|x5uC?Tayf*4Ji6?SAxMNY21VuxN}pl#j+rn-bEff;e?K$p4L;t;yhXwP_s z=s9rBpn=a^oIBEJ&x6t^RiMObM?el8O4dVM2;{DO z(li?Shi)(#gb>V!V3@~-cua`PhhdRiA`yrsJULgwg9IXYnd4hDR$rm%CHgXsK*Etp*-Y;9y!jHCEobsM z96mZsA_0@Ogf;v>HDjQ`FapEzKf|(og-&4L_+s=?w7eobgqBj)@xmb}wF0mY~K{shmrX5Vy_e#3&lAPdcDhD>F}5R!1zIq|VNyg}Nct0!r*!-fi&W&^_$^h->&#%065tpQYy8&j zsy|$B*NBhSt!UXq0H|#TsRZL*Ovj_}yoc=6J)PjXlctGVo2g?|zbe?0khJ*K{)B9^%KDhgULI@l9 z#Gm;u?0Ih+?MaHdzsJ2T_oFMagI#mw>A^7hE-uRR>MVe%i7p3K_^-FP&$$VVUTpqO z@J4XdMdCr9wNgV+U`O$9yNFW8eJ?=jm*ou1gfPhjYw-`qNl;>R9rY2ep>m#h`7Lra zaXX2b+mU{*lDMGA{*o9Rmn}Um;?hVptt-}2yTiP0;%Z>(-CQR5K!I6zr|^@iArQ;) zH%POHb!$8)4<%mFhGS1rLmNzLH?4nS9ar~#wq+2v_*$!P@pVr^cy)WX7OWcrC5tNf zUN!L&iFu$slQi;3UORE|ef-?--W|FBv{_2&&JqiAaMUQw2Al`l+eZ8&?iwLXd*|%e z`44s{g-o$125p+XF_bkC;?es!_qPV!!BGzZBP}ZIz3XvqK+>z!0pH%vBaO^yrndtn z(c~YGgR`8V5{~!4*;vD-9$#bc9RAGA&r>JDsQ#jdVCu=;`8xsr##dC|MEz+Ty0UL7 z(;lrrRgk`oKQo^hCIE?Ze37?{GX(eBmJb!s_#P$5tvGYsQR-|7z2X z(I1k+S}y%9Jtb0ETmUhn1EOtDv1#_rzp&%;geBH3?({7nrW(^uqAOBTNI`}#zu zYrB4xNd7)qW;;Xbh7Dpm(46J#yBD#`8e=UeF*0;wdadtE%8X#I}QK#({6TVd4G!^`7Y1HK~<`AZ3z{X zm+C{kA*JRTQFHK5Ge@wWx1VhoJzBDMa-brsW?S2lr(L%bxwM$Pk9tEMuPg;tu{TKi zDE8<{mP;gGKNS7<(2+N&;6Ercf&t3R=<5?~EUF#Fs!)h@~CUu6}!H0tt)G{>Q>xRcA{YS4^RKtIcLs%_nZ6s z{qDWrz2~ddtymf!8XpP(KzMGBDv$WS8hmL~03bE3mcK<9aUQk7v(j1MDKp|2Ah$S8 z7?f)_7Gimr(XyfB9F_$DV1Z3<@EEkqC1$6cZ4COby>=IY27s(3UYF5agn1wnR%mlb z;rpL{4nsDJ6#g||i)dX+%xcRi$FY^=EA-~_BD2^6FUf|oyb^-Ij(Lob*Iw*!OT1F} zDX)ZB2e&ye^wh;uB!!;^Wzgy%r4z>>J{w6lBLV~xplmdQClm_PATEL;9E8h3x#_4- zlEIZA2sHD+gc@!skmRW}Gg^ctg{>ZsOTyulm6fr}GT2VMkb{cF;vff?n@)J7yEiyI zMsK>q&6;IUVQw>Sb9rn|2NYy9nw+H`DNIEAECstut9?%FaL*KqC>h6Vba7BN!m-$Tff1Daq=*?vlKTI=TX3#1rxRVWuc%W5sl<^+(sOVu~_9am)bFh zCs!qfi9c+M%_2ci5rU#Z9wOu-0uhSJHA8vjS!}Mu?J+vc*sQLN(4D~we-SHD;+WCn#Pv>R@oWd^tWJ;9 zZFRaJjYnz-w9zA3Y-I&=8mgF?l>X;H-# z`uFh3-uVH52DMBK9+WohR7L+iq`EQmcgL@kPy&VZH!^jHvRtW@5MX;jpD79K&fhv2 zkx;QQ^y@DH66FE3hAIShfkN2y&mY~H9P@)fJUIOe6U=|Gqha;W9})-xG94GLC> zlqU;4(7rLgsU9HHqOUTBTe9{P_!l+Zt4us|XY+VS{Es2gvF*bPOJ1(KJ)sjv^1$hv zwBDgX(hrF_%Me}6a>{sW?xuZv7!aMYJLcGhQ&qZuCMVO+K zIi0hB(p>?EZ=brRjzGS@;12=$q|CvAoLzywm>*J-e;>f^BSyi(! z<6$~8Y=I4!tO(oVyE8EMD}P`2;5o)s8I^o}*O9Rkq~zb9L7FRfSZrBrMH$*w=?$Mp z0*&mSayxtwvtMP2x3ETK-pf-t<71^1ODDjbZhzP3=M{xL$j*F;L5=J5t;63iA!D-Q z@iZ~@{n+gnb%y1Q zP_2h93l|4&Pi5-fo`MDUk1p(&y*YQZ1Rflw=@!Vg`T~~v09~)vc#|>=qGd6%YYIxbB!W=t8g1YX7mWENxHH^KJ$>dVIwI}BKz#U%8oB- zfxn3IzA3MtJXRw(eQ^Gz_P^DAfDgR6hNG4Bf4yQ;RLeBR*h8gWz9(syrK^Ac+> zjyPmXw`}{EGt~I4&Hx%SPprD>8)%qLb)|s3o-JULp}=21rBr;VW;_nj4t=9{tVsi_ z?~xZL{7D0D>rZ-*JP|!@ifz4?Y`w*3Dfk5bA@l1tn}Zd1gt1yY8h5f4>ljE;zsYLB)Ns#mOca&#lnk?Tn}-6`nq>b;HYc%HP*vL5E84vNW%CobF7-`Wa0 z!!C_%4v5}?f{`X17sp=~Sbg1XCro>xcrSlG!bcT1e_`^filXWprEtTIM zclgu?O)Sj+o4Uzic<8`uyEo4X@S(FG`6AMiIx1Ns=g(>NE?#F5i?O(BWMinm`&%~L z_{ZN`r|+iHqyHoSbXl=V()IG&Baf2q0_&{X&EVNM=>5sp7D}ST9dh^Dqb0XC4c|#& dol?pHVDibjhgV6X`-8W4u6l*)BSn7Ye*w-d0LB0S literal 0 HcmV?d00001 diff --git a/res/drawable/pause_default b/res/drawable/pause_default new file mode 100644 index 0000000000000000000000000000000000000000..0ca4db8c134563057f9133893eadcb0790bb9c4e GIT binary patch literal 1536 zcmbVMZA=q)7{9()StqO_lk)!eU@#eN?~bbdjTR<#A!CAM2^?E&Mf%dxV0fl6a z@{)iWhtAARmyKo9=`;@bv}~Cg#KCkfu=oLuOLW5_%d(khvcx50SDnyt`md|-tOk>*hapC;uy%{W4#Qh z3{p*ui=lj-uYb#wL6D>|Q19m5&Rqn}2GvyDMjZ`?1vCVe?TCgcx`p9^muU)wOzspX;7ol80Ww+m0+QYbcT2;stQH&6AU&c zLUVyIA7Dcu&PaLLHr@makuIkY3_G2x#G%Map@foYqEuLesu4{v7|(0TI>Nh{f5TYQ zI#S;mW;8A)!nSd=(2vIa1X!ru(;dYPg=mP~TtH|F)oNquwjdMYD{UrN_@nj(d<23T z5ER9=2#z6o1BzN4Bx$sgxI<6kh|z*3IM%{ibR>rBEmnhGt4C2gYA8hns8w<yZfM zb0n~pp$JcfXeQw|AoyLuTAqp}NRFX+maAvk*2DzV_*tHf_}MTZ>vX_L(ScB0j<;ty zTN}d#+8LjNV}oF+zC>UR|G3VoH`on!3|-FKK%!a)X3*&j!Z2Bk7`%e@{hyj?gkUuB z;rP$6Bvir##*eF`F9@s4!-Ry5;e^$&$YsYNNQ_k4EcMab-b2+lnxLM=sz#?rih6&L z|1H_tPzW~m7eJB^-&2O6;;Iq}>bcO<^A{wVNaBBQ2Uj+{xMc&M@!XWX#5^v!HE6hT zdhBkULZmQ*qFa&$$rR@QXwciEl^p3Fj7iO}UVU?L&jyA0(8y!y{cRBW6WEoi%-kD0 zwpsC-igkGWN=-i)UN^^1&NuGYUVIGXU)El&d6@o5l+b5*UYRC;&Js%% zUDk0~YD}IEp1r(NTGlmtZ(UX{l6P?=ATzQ z8p_ZO7alK|9=RmVmN&o9Ry!oUW}dlU9wRO0wBY&m=>w;buN|@M>)#<-sC3g6h4|yc zIc>k4q04i&{W@Dad6;OwIl7`+crg2EJu;uOv3a}8KUp_KTi%}Bm!=e-$S!WEhXbkVqD=x@xh~LST_G;S&tEcB5C;kCy literal 0 HcmV?d00001 diff --git a/res/drawable/pause_over b/res/drawable/pause_over new file mode 100644 index 0000000000000000000000000000000000000000..a2a15e52b4fbc141e25294cff45c17669cbf2598 GIT binary patch literal 1531 zcmbVMZA=q)82`5gsTB=xD%4QV!;Ked?*)2o&ldX*jTTEGSeIqv+Ft32?bW+O3STU^ z7<9;(M#AFUz)CW+SB%S?GZ8bE$u^TNI!26(i!X^;FhlvG%d+hX)a`@u!!Ehp|9S5D z{hs&#VNYZIYK2k(09fs6uzSVt7V*X9D*%w3J6Mn{3MGQWCp5Dmp^M^ZU8jDNTswjp42CoZj;lorHQyZ-sJJ@Hmt`32G#}uY zn82`6D9uRu*-pU(i;*s+5Q(|n&xoV^a-qbMA#o~(U>X#OMACUJTJwUJ{x^*0TJtU4 zF&gpGJln|y#D0XzGGMWGFLsnR6r&+`a*Ws%YOkFQbVlf?;If-w@sB3R1W6RrqZp>E zMRhnz=rPRVwAl<+o6bqtbg03CWjLOPwP%{e1tzH}^ivfq1vBCdSGeisqNe{<= zh9#pCCop|{Hu|FQY1iZkaE zPn4clPp))rl5u&`wW>o^SrRpLU~8RjA^B)Lrzv%`>QLWh=$q>k)8KlaN_jgEN~8)4 zh#`5)1+W{m!oU9b^%`V$KJnByHJG2`51mOQcMl9GjeF)HB5smsKb`1TmyNb#W^m;@ zg{Q17`<2emWc{Yz`&q50CLf<()o|kU$}aHJuD)Eij0@d4x9;PJv}T?d@?IIcuPm&S zjjizc^INYZ9dC}v3zbD@+is+qZ1t;4wZe_m+u;Z6rF-@t4^$wkrA-A6iiKcV8V)dX8@| z2+zJQU6cL!v5OTAQhM~kwjfv!7 zY3JMrf%?*|zs)YI1YxeZYGh$huH9I9{%+;fiP7o1)rwrnwR}~%^;CJ@?M>GQPnzf6 zGDauC!|`>JiI?6}Az}MHdEU;fJEa$1uACR9Erq2=&2!fh2abSylWy~^tn)IXLIyT; W49qNC`q`1bj$MvM`zO}6zJCC|%moPm literal 0 HcmV?d00001 diff --git a/res/drawable/play_default b/res/drawable/play_default new file mode 100644 index 0000000000000000000000000000000000000000..cf455e33778685f16393bb551a0a2f496b7fd367 GIT binary patch literal 2267 zcmbVOX;2es8g2q|h9D?-g|TT6MIq@9M-GVO){F))G8(U`bdnAP$U)LB0i_6{i@1Ry zAj*ivgz;jO1+U#LhZ>231L%nCjQ6fPDCh{QuB%kZc#!R=xckGJANy5x_xFC^`#kSm z)m2#;%Yp;v1_A&OEL|>=6W=AoL-Y3q0I%=&4&En(Ik;GXuQqD&BGille2r0sfl@u1 zgUK;eQ(V}Or2&AqR+p{76|$8awNXz)Jvub2-bA1QAT8Z$Le=>g4yv#moq-GetFsFN zbs8?THdzMCOhPPIx4guRtuD#PR+r?f*%~N)DVS#E5CnP*M?tH;z+mB6xzJl)4zc$f z(;@J!3ZBn}-Z`a^Wr0GY83U7PaDp06fx#4nh9o92nap^Q0V6OSX3!Bv0>b1ZGB_{{ zzF!bw&8*RK_lY7>Mz^9SIzof#dc7yEx7rq5 zj{Vn-k7`@8i%l3^j#-SG&1#|^+UO}Tk-OhEuNffe{vrAj~9~$$(Q>2*Q^Lg=~S4DM=ABVKyI`;`kU=EMbaSNr`M$N)mw-BdkQ2 zfC^IhOo2eaW=N*6QiBCY4Qg!4u8y$#9?SYoEJtX@P~2$FHW~}2Iv^|8h#M`rMiVGp zoeauQwa(y?J>_{9tq3#geurr!W}_Z_n_rIZBlelef)tjRC1xP+;${hvBng9+oXjGc ziO*(0@3ETyCuelR8M>!A{-;@{j))HQY(KO9^J#xR@S~l)+=ejNM;s2vH#NlT?u(AE1jixTHsN`bWvxDq zTH9Yipibkp3uf4S=0wfiJJ8(cBkvs_?tO6?Zs75?v*&>}9y!)G$>onfD3fdtwVU{G zMd*`7!dTy!S-f+_v5nJzCoOZku2YEua~4ei*`Uu)AEsBK=9x550q;7CK{MvSP}gMV%Z4kHj}6 zR#i1RUjf;Dc4}c?-6Kc;8F%@r$@%-j(OZttfC?`jP;Lp#Dx|{S{?d{II4yI_|C|K* zMR+@a=(Tq*ZsM(o1rp+*>!$rJ_U0Mok4Q>t1nEvQ~Jox@_8^!9DKGp%rm$U+rE>N=TYE!v1Z-&w;|SF&c=D4FN) znvSM6BJoSRckXC-9KUMUzi&(nne>i4TkvGW`?MJjf<;T4lxJ)&NlstSr3d6W^ZK zKhSb8b#^|QVegKr!8C1{($jDUKO)zuXGsvs3-4TfN3yL88wBubSaMQFm@0 zuf9!*o&K$#O?C-7cz8jacVA;9J*-pJ!5iHO=Zi-cR95i( zV(*#2(cn2(@A+Okr-`ks{<*7Ew!W+2i65gR!5t8%^t-NNmK$n&uT`ph+KvtiONW2S zoL|rE_Th`o5u?qvVXJ)>*u%bR2zJfZHoYKcE7aCX0G zY+N^P)BC2jPAqfwh?UHe;e8iQ(ZW!+j7kPxe^Oq(@=h$r^SdDxXNcMb%5DDv?2l=@ literal 0 HcmV?d00001 diff --git a/res/drawable/play_over b/res/drawable/play_over new file mode 100644 index 0000000000000000000000000000000000000000..42d81a84587fb76f0befb79e2d2c38e357c2847a GIT binary patch literal 2252 zcmbVOX;f2Z8omi3fk1$O*a%dv0cl-G?hV<9GLnTrkSJxbq2id3Tu6ZAhU6*{w+Og^ zXx%_mDoZP^OC7`+Txd1QB6zgb8JFS)hzRY`0a2?{3(Sp*ogbe5n0wAW_j|wlJkPs) z?|aTylDHt2Mh&0>06qR9G^aiREi72q4y>83?E_ zYO;_dM59}g*NMyp0GCWdiV9OH6GU3n$kI45ESu4cvjJf4Jeygg%|S3Q1IaR&qL@R? zXPKZu7sdRPr-YPdDWW&T6sIyE?)a2yeCU17pB zws4a*WI{oPShW^|88e_J(5a}&K$l@rOgz#zDHzR4lCfY@^Yc z*K4#DOG5q#GG4nscjN@((TEmW4EUjFa%HG?nGrEz z3Rx5r|HIN5bRq~ALNF}gLIMuN7s9YuE|o?~qyjl#Du5!z@Px+uxG{1;jF1~46Y{w@ zGX@q$KsZ&x7Yig3NhC);!Bv>7n8u_J&K`L zJ!%G}$vjZ0(Hcxn+j%^1vXvng!*WC?x1dJwb$vyK_xKm^Bz$3vFopxa$y+FexpIz> z#}nesB#z`T-*R>TPtDkPFl=XY{7o#3k*_|B!IZ@CaO;4+Mai%<})e%6;o@BDV9QB$ee4hU8^QO&=kUhgx(5I+`K!fg` zvJTAi^OFUA6ObF~kuaxYPvUL{XIe8czB)_d2b?P0?wWbBv60h})ZiHnz><~+-jyvK zZpXK|*8@`;fR=+^4*|yNp?lx2g)W0RJ*8p|WrTQ|T-mJFl=$vft!lAPt}5$+Fu-f0d@DrXry~PFwsW7_>VU5Xh@Td?*rL1g8h+5falptYphY zF(qMezsrFz^_9^J2O0Z@#A0$QRi%{QBq80g?pe9iV_oO%;i(z$hxO;yxkgHc0kPV1 zjan@5UlI~8DNI{`#4VJZa3Mk1GDXo#(HCxv4QibG>hbLp<3$<1d;K+C+v!oi5r}S8 z$@bDdySrg(y3clE;JPMm-A7>=z{zKXfX_BgbsJn&Gu_W#F^Qfd{GmfW;1WI)K(vVk zr1t&-3AyDsziF_g+{=ES5T|$oK&2nTp6wO)H*tf){%zNFy4FnJprVDfnP)qIY(+@? zx%KQaMPdYD@E7uA=J)gClp!6^E@;E`#IFLpbRQ6Qc9YV74s2^HKJUxORXBFo2u;7+ zO~R9Il*}E$9eapf!`)}sQgX7hO|6TnzFg_G$HgbQtRcbj_!iHF&*!hLsU1JNW>iF1 zm9BMsO-Gl@kA8A>3H94F1%Fb?jJxN`vFNl9^qSzN`?SB!uWg%J>TxV4;7sWjHKA-) zZPCo=n!^J-A0%a@Zw{p#&5g6npr^fvI>YpBJJ5Q1vNC8;-$s$0npB;0wN-rCK5APM zU!S9K_zeEyL87%G!2V6?4q5+*KgqX}p$95I#{6$QWcf`e*B;yh0dhrg@x^Fm zZBybAlph_I$;ec1P{i?dBQH7Mees|1>eN}C-sK~6yY+iFTzj#%G4H$cmODi!Nc&Gd$j z>1;wmqHEd#?*$k2Js zQM5sR)}D_Kzq-o3yd2oJGH7)C9uMBw{`5w}p+k;kcdOlx zBJ=oS%Fy-Il0KUGG<|YRUjM7H6Ts4@ug}*7=LIeOtm644s^_eiDHZ)LKx5|F`|2kp xz#1}nM3#E}U%!sA9giLIja&O3F{ZLyUwTukwB9SWXqe9Xg(7Bw?5IRt_+QX|R;>U4 literal 0 HcmV?d00001 diff --git a/res/layout/active_call.xml b/res/layout/active_call.xml index da2ff0643..55b853b7b 100644 --- a/res/layout/active_call.xml +++ b/res/layout/active_call.xml @@ -15,19 +15,29 @@ android:id="@+id/contactNameOrNumber" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_weight="0.3" - android:gravity="left" + android:layout_weight="0.4" + android:gravity="center_vertical|left" android:paddingLeft="20dp" android:textColor="@android:color/white" android:textSize="22dp" /> + + diff --git a/src/org/linphone/AudioCallFragment.java b/src/org/linphone/AudioCallFragment.java index 41468a6f6..a97a29e67 100644 --- a/src/org/linphone/AudioCallFragment.java +++ b/src/org/linphone/AudioCallFragment.java @@ -19,6 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ import org.linphone.core.LinphoneAddress; import org.linphone.core.LinphoneCall; +import org.linphone.core.LinphoneCall.State; import org.linphone.core.LinphoneCoreFactory; import android.app.Activity; @@ -71,6 +72,13 @@ public class AudioCallFragment extends Fragment { contact.setText(lAddress.getDisplayName()); } + ImageView callState = (ImageView) callView.findViewById(R.id.callStatus); + if (call.getState() == State.Paused || call.getState() == State.PausedByRemote) { + callState.setImageResource(R.drawable.pause_default); + } else { + callState.setImageResource(R.drawable.play_default); + } + ImageView contactPicture = (ImageView) callView.findViewById(R.id.contactPicture); if (pictureUri != null) { LinphoneUtils.setImagePictureFromUri(callView.getContext(), contactPicture, Uri.parse(pictureUri.toString()), R.drawable.unknown_small); diff --git a/src/org/linphone/InCallActivity.java b/src/org/linphone/InCallActivity.java index 69e82f461..f1a71e814 100644 --- a/src/org/linphone/InCallActivity.java +++ b/src/org/linphone/InCallActivity.java @@ -438,15 +438,13 @@ public class InCallActivity extends FragmentActivity implements enableAndRefreshInCallActions(); } - if (state == State.CallEnd || state == State.CallReleased || state == State.Error) { - if (audioCallFragment != null) { - mHandler.post(new Runnable() { - @Override - public void run() { - audioCallFragment.refreshCallList(getResources()); - } - }); - } + if (audioCallFragment != null) { + mHandler.post(new Runnable() { + @Override + public void run() { + audioCallFragment.refreshCallList(getResources()); + } + }); } }