From 8ffc8319fe43d285436ac2be1129ddd5d017b123 Mon Sep 17 00:00:00 2001
From: Guillaume Beraudo <guillaume.beraudo@belledonne-communications.com>
Date: Wed, 14 Sep 2011 11:04:14 +0200
Subject: [PATCH 01/62] Preliminary code for conferencing support.

---
 .classpath                                    |   1 +
 AndroidManifest.xml                           |  17 +-
 res/drawable/conf_merge.png                   | Bin 0 -> 1011 bytes
 res/drawable/conf_pause.png                   | Bin 0 -> 966 bytes
 res/drawable/conf_resume.png                  | Bin 0 -> 1007 bytes
 res/drawable/conf_terminate.png               | Bin 0 -> 655 bytes
 res/drawable/conf_unhook.png                  | Bin 0 -> 1169 bytes
 res/drawable/conf_video.png                   | Bin 0 -> 402 bytes
 res/drawable/mini_stopcall_red.png            | Bin 0 -> 1632 bytes
 res/drawable/unknown_person.png               | Bin 0 -> 812 bytes
 res/layout/conf_callee.xml                    |  29 ++
 res/layout/conferencing.xml                   |  60 +++
 res/layout/incall_view.xml                    |  19 +-
 res/values/custom.xml                         |   2 +-
 res/values/strings.xml                        |   8 +
 src/org/linphone/ConferenceActivity.java      | 408 ++++++++++++++++++
 src/org/linphone/DialerActivity.java          |  11 +-
 src/org/linphone/LinphoneActivity.java        |  26 +-
 src/org/linphone/LinphoneManager.java         | 162 ++++---
 src/org/linphone/LinphoneService.java         |   3 +-
 src/org/linphone/LinphoneSimpleListener.java  |  50 +++
 src/org/linphone/core/LinphoneCallImpl.java   |   5 +-
 .../linphone/core/LinphoneCallParamsImpl.java |   5 +
 src/org/linphone/core/LinphoneCoreImpl.java   |  93 ++--
 test/org/linphone/TestConferenceActivity.java | 350 +++++++++++++++
 25 files changed, 1146 insertions(+), 103 deletions(-)
 create mode 100644 res/drawable/conf_merge.png
 create mode 100644 res/drawable/conf_pause.png
 create mode 100644 res/drawable/conf_resume.png
 create mode 100644 res/drawable/conf_terminate.png
 create mode 100644 res/drawable/conf_unhook.png
 create mode 100644 res/drawable/conf_video.png
 create mode 100644 res/drawable/mini_stopcall_red.png
 create mode 100644 res/drawable/unknown_person.png
 create mode 100644 res/layout/conf_callee.xml
 create mode 100644 res/layout/conferencing.xml
 create mode 100644 src/org/linphone/ConferenceActivity.java
 create mode 100644 src/org/linphone/LinphoneSimpleListener.java
 create mode 100644 test/org/linphone/TestConferenceActivity.java

diff --git a/.classpath b/.classpath
index 73e3fe0d3..d150c0422 100644
--- a/.classpath
+++ b/.classpath
@@ -6,6 +6,7 @@
 	<classpathentry kind="src" path="submodules/linphone/java/common"/>
 	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="src" path="submodules/linphone/coreapi/help/java"/>
+	<classpathentry kind="src" path="test"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 1c7bdc86f..7e38ea7ca 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -42,7 +42,13 @@
                 <action android:name="android.intent.action.MAIN" />
             </intent-filter>
          </activity>
-
+		<activity android:name="org.linphone.ConferenceActivity"
+                    android:launchMode="singleTop"
+        			android:theme="@android:style/Theme.NoTitleBar.Fullscreen">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+            </intent-filter>
+         </activity>
         <activity android:name="org.linphone.IncallActivity"
                     android:launchMode="singleTop"
         			android:theme="@android:style/Theme.NoTitleBar.Fullscreen">
@@ -103,6 +109,15 @@
 	
 	
 	
+		<activity android:name="org.linphone.TestConferenceActivity"
+                  android:label="Test Linphone conference UI"
+                  android:theme="@android:style/Theme.NoTitleBar"
+                   android:enabled="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+         </activity>
         <activity android:name="org.linphone.core.tutorials.TestVideoActivity"
                   android:label="Video test"
                   android:theme="@android:style/Theme.NoTitleBar"
diff --git a/res/drawable/conf_merge.png b/res/drawable/conf_merge.png
new file mode 100644
index 0000000000000000000000000000000000000000..2f76509b581c049304baf0faddc40a9baafe8788
GIT binary patch
literal 1011
zcmV<P0}T9$P)<h;3K|Lk000e1NJLTq000>P000*V1^@s6{^R5m00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01ejw01ejxLMWSf00007bV*G`2ipk;
z2?#9FI>F!o00VPLL_t(Y$F<g7h*eb-2k_syGu~0>Y9CsbbF4vUOy}AMsL;dEn-By&
zh-O?Uh$Q-;NbSQ6Z_~{PLm?`n2Mdw7Xg&54VT2{UWJTo}m8LMgeh`W>j@jsVPY-v`
z_jt93HXK;z?0xost@U5)zc>HWIMg+J$ZourA9@OfE6%l*%R~0jHL-KKR2oGFs>5rd
zdYd2o=s}HN<*w?)rTKeQQ>4S&WiJhAf9vEGBgw+StxGOuv(r^o>qT)rB*pmbsEO1N
z0AwZrSd7IB*6qt?vbn1Ptitp8Qsw?plhNn|4S^&ZW0;8*cmgw{rsjHCYR0{I4%_mj
z%8J2>>cHp(MR4Gi7S&0Se5sPdQ+NTZ@p(Ps+sfq_%dr+GuoYh<#g@M4a#hEhCx#=b
zPO62M6yrXe!p&HR&i%!fdR15HDHPttHgw<}Y{{37<<f?Xr0b>{NO#wWO)}TP*Vt2|
z&xS>%V-L5L%ZtO43lZeTfNjEhRPacRtBACzmagQrn6$RzqEbb&agO{OM?0|rccBG;
zp&vW&BWB<%zQ-*56pCgep2c@qofPB4nKYwOTJxqUGdZx7N{aE`e5vv@Vob+8%)w)L
z6{j%;2Lj;7*c_Z#f{SR!;cBKTN{TIr<V%%7UdH7<U#d(C<{iid&en$tn;ZIVS<;o?
zo$pFILqs$1Xi|*38^<?&6zCY_DS~sM!uE}*tR$FAQAvvNZkKxnUYfBmWT1PfpnrdP
zu6djPkS`s*Chh7e6b3;O==Y6i*ty=o)32js<)112|5+SIj;5abf>jpy>K#_$G-Rk6
zNk3gFdg!xJ0Bz-RYj}-up-#{IFk)RhejChw<J5*me^&>H8uXm%9ox~%um(3`Hkz1F
zF)y~2%gY1Moq^PvLs6#2`u<|9Ve&NDSqnAY(jk6e6RZrqG7Gn2FLvYn1R(v`j=S+m
zkeC-kE7UkyRH`_%WvM9JOm?aueD9+HMRenE=#MLndoVxPXHXfZ@$l!aCkN&JnGo{Y
zlRxhq#nIRYts&~uID*H~`b*bs6Cb~~uljIM?&DA<J6$+mPla3Y0d5GNc4F7TmuB`Y
z=sHsOj6aU|;Pjy{kDqycd%enyL(@eetvh-Og}%18%j3_JYrR19w|`5ThLbN9rF4`k
honh_Xu@{TM@h_b*CKRPL<lq1R002ovPDHLkV1l{0>GS{q

literal 0
HcmV?d00001

diff --git a/res/drawable/conf_pause.png b/res/drawable/conf_pause.png
new file mode 100644
index 0000000000000000000000000000000000000000..9ab5bae929a0793244806a9440574f79070fa8f0
GIT binary patch
literal 966
zcmV;%13CPOP)<h;3K|Lk000e1NJLTq000>P000*V1^@s6{^R5m00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01ejw01ejxLMWSf00007bV*G`2ipk@
z2oNBQRQRL-00TxzL_t(Y$F-HuZ`))T$3K3Z*lm_J0(DK=rbBGb)?zVET>B^NfCNJM
z3nqpp?X)4*$&>>EapJbaBo4?D+!0)+X@vv#DQzaD6RZuaqp+<lYkvCO!H-?LN!DGk
zWcmH&@AvsWzh3yCp8MWxJkGqz4~=Sd<euaE@p$t}nZ3M58wS1L@Qm>?@cOL_WNzn=
zHKKd=E`bL0A)M9iQTgK0a3vb3-6)eOl(4KxPW#^}Q4@?J2?ApPBqA74QosHNebomb
zJ9UP$m+vZ|0Azukh{*B%3@{7)*{D`~0BvWLq=Vd*&3LAwL2bDl6JTaBtQ-P<6?hN$
zSO{i;kAO?SO(9Gx>!p_z!1^b1DNTl*r*iQpfD^z2-~(XK@%?GwAK)o)0cZjPK~tFy
zYoE@fNrG&GK^1uG+P&od6fg-)OAHG#?*Xp?<6#_h%3a!2)Vz}+$eK5oB5=JLwHxzM
zye5Ddv33eD<z!o2X+~@A=S@&)BD5XCYDqf{A;I#z%wi=b5CFSCALsxrF`@t%b}<aP
z>owE4q+xye6e_~A)tDHNw1%DlB3~^;2l8$M!R`cXTs<8Ut!$<s0u`Vlt1Dh(SP2-w
zm{^||WjUY>SYkvUpk;Tcd2T4c)G0M;u;>SxKu#8?CEMD-e*)f5o$T)>+{R#?B;~p*
zTM^r&#Ke-!dJNd2sw4j^yRj7I)X<I)leEU$!#Ye?tezC2eThY+WM9az8%tOlOGBG!
z9C!i){loi5_xA*FPYSREJO>;hHHY=T6p;ZcXUZAFq_MMmRLKFb1N<dLXNnsQ*?$If
zjrre3w`fD5-t>M)1Io^!>=SJLcs+R}54;ZiEOqh-D2j{jNS%zG`SJmd@5gsbvRS&`
z!^2d%|Mk0Miwjt#MXcfi<0s!{Vy1!wx&ZtO^cvMFj_+H*qL6Jwak=M}Q9(N5uD6xW
z*FV0$NLEO!(jvk0C$#=vr}WN;1HN{A-;}jDjgt!cN^#zMIJ_vDzusbO?i^Nek?wY#
z&UT&sZ*ITx-QKROVji?u_-g0)>v#X@7VYgdo_zN0Xh3I`s76NJ`^Vn#M{~Yi`6X=W
oMwncNhCplFdXtT8btnPA3ljqzI?lNkUjP6A07*qoM6N<$f;x@7{r~^~

literal 0
HcmV?d00001

diff --git a/res/drawable/conf_resume.png b/res/drawable/conf_resume.png
new file mode 100644
index 0000000000000000000000000000000000000000..b8a2d50cd342fbc5a84dedab37863b84e4f1a9b3
GIT binary patch
literal 1007
zcmV<L0}%X)P)<h;3K|Lk000e1NJLTq000>P000*V1^@s6{^R5m00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01ejw01ejxLMWSf00007bV*G`2ipk@
z2oDOHwLk0t00VDHL_t(Y$F-HuZyQw*$3O4cUMF!v)hd-u?FiJ^CCT#Zg2XBR0Ein>
zwGwAI8NsEkAYp4jRS~C193yc+mZ*fpA3%{Bpb`gArFI=xT7w`?n^4n4Z4>O+-q*vv
zwRdCJfdfxk>5bPr-<j`xX9oVKbK5@EyT|{{2d-raKn;7BFPD4wjrVdqoKz?w=y?7A
zh*8d~t8Wm$I{8F^;Iz+N!&89jyEEDy3YWHqXQBXSIY<0h2E%v?&;NYn@jNl$Bmfuy
zsebqj71>1qGLb?WlXyHhlFp>NNGrb<;wK6!gNw72qbs|<5lbM92}CkQzPysnmsd{y
zm!f-}C_w^X{X!Nm(MJ~($5}Xk6KEuXZ-DQCvTGH$p5!=^2@28mSorjAAH-SCg>pNF
zX*=3z032we2D}SYT&q|g0GYjZh$aQ{0MovQsMuLlP&f_XEYAQ6vvdQX1;q5z1a1Kz
z06znJu2t*=Qg-Ytghe30yjVv#ALT&#s(QXu$61;I;S0(v-7tVHU|fU5L$coiR)H^o
zyD;7IS(%9_UMh(U?4%si=n=(EX>r7X?xDUq4!i|i0kY7D`GIXjTzJw$2B-zw9ahgh
zT@wL}g<2^%X<!!k7MOsB1W+**EzMxlN9>NyL>vNc1D<|%f!}pzNdVK{jCkw`x_0g~
zvzLFvENvXlCJds0l(rS{E3gJ!0(L7)FSi#y9;Bn!jLq@Z&}P;&bwj^3HHCM8^T1``
zzH1fRMr{$-vW9>J^mzhx<;}>;Q>ptN@K7r&$YdM%33%I(?dz^p{L8h9;UI)-S+Owt
z@rhWReXj!|hTDkFsXKcoQospK&o3I}LPB<~ub+K?9}xL+S=G*+Ms2(rp4R<AFQm`)
zt>qlCu_=u7Jju)gxz|1kIzFY9^BwS&-y75WVM@aLMDLz>E5FtWY_nAFtLFCSuaHR3
zVPxhp(sPWTe1WN_3qa#pzagiap#>I1Ei{k^aMR8qy=cWvyB^i+A78&iLW3BYdA$7{
zn)lYpymU5*a^&<456P~SylDS9d^2wTxXM`eIgIo??d>WD+f^Q|Ts?9-_J9g&#QteA
z_gUlU_4{bIPHVfu&c!cBMxJyRNACS2cf4y^uj}jIz=Kxd2M49}NLL62o>G|AO==0h
dRzZEj=P~SUI5O!ZQ%V2;002ovPDHLkV1hom%h&(_

literal 0
HcmV?d00001

diff --git a/res/drawable/conf_terminate.png b/res/drawable/conf_terminate.png
new file mode 100644
index 0000000000000000000000000000000000000000..0a11c639e4ba5e9e15204b745784fcd7c12176aa
GIT binary patch
literal 655
zcmV;A0&x9_P)<h;3K|Lk000e1NJLTq000>P000*V1^@s6{^R5m00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01ejw01ejxLMWSf00007bV*G`2ipk;
z2^IlBq@qdy00Iw5L_t(Y$L*9&Ytumx#(y)3B~}d~CZ-6@Now`bg9pEbM}>->JP4k>
zh=+_9J&NE*u;L4P@az}RQx6JK5Q>ygk{ClQp~io9Jp5m5z_cn+DmbvP?9R@!&pb0D
zZ*87GZOUJ;{GJ|$CZACt>^P662@=MF|1;@o8nXwX5<$0WY)yXpAqP0r_hczqbs5@)
z<7Hz5;FD30$ek5Nb<m;{wuM|*k@c@ct2LvQMQJpYTUQ+FzAH%2D3y#}+c*JwQ}8n&
zbB-4UnQ;gL1Mt2h9bgUQS=B~Q5@wn(^T|wrj<Epx7<|bQ1(57EeJjacaOeT+fzYTK
zFXD`tVz#pibxinxUJY;>P>I6@@Rv%MAL56=PeNFBc<%9C30P8erEPjA0SVZ5t@}{Q
zkC&P+ILxHK4M-%&yR!L4;<6SmfArbB@&&!?_$7hE4%geJR4v@-z_AK60ftb}owNjL
zfoy{Zkf8X$VfZ64j~Jbbh06}FK@cPleyw9%tXK??B)Ok4X+j}SxR*oUJ95flDEO-g
ze=w;uKN^dQ%%#~DqzG~j!o$?33WE&f0BC^CqZV%eY?C><?08*}kQRnRxoZ^5Mn9bx
z8A#H2TffrDBf`@ha=~FS)lp*&`%@b$HRDYVKM&j&XaTDbR(9=^-?gSOTY&NiqN=fp
pk?%vXXmqCrvM;9ae~|qL@(s=j&ybyhu^j*a002ovPDHLkV1o8t7Bc_<

literal 0
HcmV?d00001

diff --git a/res/drawable/conf_unhook.png b/res/drawable/conf_unhook.png
new file mode 100644
index 0000000000000000000000000000000000000000..2f141582dfeec907dfc2b0417bac0816ce8abc69
GIT binary patch
literal 1169
zcmV;C1aA9@P)<h;3K|Lk000e1NJLTq000>P000*V1^@s6{^R5m00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01ejw01ejxLMWSf00007bV*G`2ipk=
z4G<c8O%u-m00a?9L_t(Y$F-G9Y#UV+hQD*ij%WNxOG`x>KouqF0@5O-Nz~K^wGtp9
z6$uGQC4>-S11t)v)HQ21AOQ;`Sg@tEE0zcWQky_(8>x?=(m)?lTT1EM_RPfg+{40S
z$8O`m0%kLJ9{2p`{OAAgf&b~+RmyeNiT^V2^c*-z7e%Pk{C6O4oX)e=on&)rj1hMm
z8wVa{F+9Q9V1Y&dBp2_T;IoM`h4~a1g8~}wb&RtLh{Dd2$A;uE>)3!NSu!R^+DYTv
z3PDt(W-A0*<z~_+U-UYGyFzeeyt*>TQ}ZrSNdU;0ENPR)Gg&+*L)v7y-Mm3ys{~OE
z-`4P>Y99`y=gG7e`Jy{|JsTzfk}}W&NMy*6C6`!3vOY+oew%<AHLbL&u`7c_k=zS8
zHJ>A4nhyzF6hI9-qPkxBX*xW=TF+ko3NAmAM$u00syZklHFY$a8xNO3@<oqk6gUaT
zi$vvl75y5pC|^<!-kL2?SyfgF`EnYx-5uG2a3+)V`Q`~Q`Lfq)j^jqR(g7-ZphKnb
z3aRwrf7GtP?1YbrLDbj=s#2|caUk1HMp$?pfCqc`>)KUK_dSUxf6i_II5HKYs)&_y
zfDvH2m|kvt6b0?D2YZ+>yxR{TUvxihWW9=wqO19$SIHmqX6B~Cb{C>n6^dzhY<@@U
z-i-YB5sr89y?@sN**-k&1>E={i^#JvT|LS&Xs@ahj#n|pc?LKUgUmF1?|k8y_ffv&
z?w*>@tp_N~r?zw%JXRKe0IV4doo-{A_F{YKz7DpHqQ623rd9a>SOV6o@D3{9B~9~M
zzUZkM^DD5f3*(v*`vpMdrZ?JS#&#+xZE5<&``;Wuz*Wx|;ec%<hY@)jm<8%9aCQUL
z&yC1d#hjfkr`D=)wYx+ql)R3-htKWd(99ve{qx|!ru4XZ{q(l5^P@td7C7PHz>u+t
zAyGBr$n`+|3$A)mti;sO$#ChpMYwY--O{W=B2fuw<UEWz3_f-dfTthWTi;%SlzK?q
zFcoNIy~wd#0=<NQTE)fdu4*Z!tCbZXHp2X{yJggjlfyL`K0LP{fbs;)O$FFSk`7W|
z$16sJqmv=i<rFGir}2*Zvant_KEg<9j1g}uBkmZR(&LQgM(;Kr;otzqCJ<G`5d!ro
zPqe-liY_YB(VT50`Elo+-ZS~VGp{n@wSXRV$GFwJ&SH3qJwvapJ`s!QmKRv2)~IrH
zGF;){2M%BUgw3gKjCy1I9xm{Ec#7YGlPm@&IUD}Mk`2LFP(kiCN~bdcvjzH3#+Qco
z0dS>yfk3PHQ3c;t32coe4O(f%q~8l*nVnp^=WX8^Ka|}Bz{iXG2yBHwYjNT6Bo_l}
j5$mw=LXAT+{ptK0fD^HfXMy4800000NkvXXu0mjffhQgL

literal 0
HcmV?d00001

diff --git a/res/drawable/conf_video.png b/res/drawable/conf_video.png
new file mode 100644
index 0000000000000000000000000000000000000000..6e76164044eb22994f45ce0018b5cbc312b896df
GIT binary patch
literal 402
zcmeAS@N?(olHy`uVBq!ia0vp^l0YoZ!3HG%J$@n#q!^2X+?^QKos)S9<gg`qySp&_
z2f+n<mrn+Ya29w(76Y|k2Vq7hjoB4ILG}_)Usv|qoID)DQi-KSSAnJodAc};cpQH_
zWxv<q0Fn0nx7nVStoFWby3PB#kVZ`W0)GWR**h$b9~G_2U%iO7=*YJE@=kB*i${wh
z+W97W?THoQP@KvVwEWMp`+J|)%(4IOwA3rrLwcu2^{SKuLNA#5-m@mYx$ebs$Cbfh
zZd%x)UX#Y`2kQAr_qo+>buc_XQ2XZgtkSFNtG@0%z+}-WA-;ogmZfBL0@EB-MuyJ^
zzjvDju^%egos;wIN|bbA<8j;2v~x$q<^)PdxE9uH&HTbrp~di%VOgZKRaDS@_Dbeo
ztO|Su+-EMa&(?prRR363<Z0#)YecdaOun&Yjai-B?c$}qEeBK;7{Wf*O*p=y*JP38
s)>{35_J3i=4j;W(`1N4eFZs6&4vMZGKFzMTfdR(g>FVdQ&MBb@0AJ^z`~Uy|

literal 0
HcmV?d00001

diff --git a/res/drawable/mini_stopcall_red.png b/res/drawable/mini_stopcall_red.png
new file mode 100644
index 0000000000000000000000000000000000000000..fcf26c8bd4f50783b6bd84862d3cceecb945c297
GIT binary patch
literal 1632
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

literal 0
HcmV?d00001

diff --git a/res/drawable/unknown_person.png b/res/drawable/unknown_person.png
new file mode 100644
index 0000000000000000000000000000000000000000..ac5ea1616e1376b5e59c05023e1ad10d822b7742
GIT binary patch
literal 812
zcmV+{1JnG8P)<h;3K|Lk000e1NJLTq000>P000*V1^@s6{^R5m00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01ejw01ejxLMWSf00007bV*G`2iph}
z4JsO3AXEJS00OK@L_t(Y$F-GDZxTTm#-De#>{d!`JQ#><HEE%iuF;F<egPA2CWcSo
z)l)UGWJQh9qeqh_o;J~g-=GK4gBLHhTQGu&7SdLm)Re}u1!g=93+%GM*2Fo@u*3U%
z-oFF<r}f3W(A`gj`9nFI6~n%zEQ{Rz_FWzIn1CQci}&u(DC4EIn~{n2*vU8%&4qWw
z1pv`Ar#4$iKiv)XL;$dJ`t-z1qOPiEn;d+sr<~J(5f?B3DLuHvwpg1JP-l@TFf|5_
z!?6&pyeynlp+_Pwl(`#wRY#k(rEDbvQllVk>YtL%TiyT>02J>h!6SV_qUW%5ZzELV
z-R1EF0@UVMda~2=q#pn_(*+dGBsO!&aPo!lXcr2DZJw7Vx6GsmV3;=S+$`*z4$cV#
z@~I47#-kd*ydVfoniZY06MzJ)&UQ|t!r@DNTz)gmnzt(iP+YwT=GxQPWJkat;CMF<
zBVWb*f<=C?lPb{RG*DTYlOE-_JtjEgV6N)4SsogS>n}e^z8TO|oz>7zV4H^gSrMK)
zY_RElXGYx$^H-TxS@yc!mOUlIhQVg6tjuBl**6&Z?NiMztt>%Ksz8L`Yu#pSoN-P)
z9Q`o0vMhq`cM}gz5N~dc1f(pB`loKFsZ9WjDxHXtg7W_1&@n#Dc*?SfW<L%G6O&oq
z%;``jr=i9(&=O0~Z#)jI)DJIbvz}pT<f}3#SMpUbH3m|r05yuApWmXs^EFhC`p+At
z?rmBYP_N%#-$5jiff`?gn#h3vIY8rA5s7QJLlr?kpv@RvHGhb}m$CL?4U@^sP~#ai
z_ewa~E8*zHx(GYwopgbe;|480-xp(_-=p7EID1<-c=$?;QttN2u!0%;#{0wLq~8;S
q=)8OaBmgc1j8YAih`bwAg?|BI{TUEoI2eTh0000<MNUMnLSTaYa&Tt=

literal 0
HcmV?d00001

diff --git a/res/layout/conf_callee.xml b/res/layout/conf_callee.xml
new file mode 100644
index 000000000..03d99b0f7
--- /dev/null
+++ b/res/layout/conf_callee.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:layout_width="fill_parent" android:layout_height="fill_parent" >
+    <ImageView android:id="@+id/picture" android:layout_width="wrap_content" android:src="@drawable/unknown_person" android:layout_height="wrap_content"
+     android:layout_alignParentLeft="true"/>
+    
+    <LinearLayout android:id="@+id/callee_buttons" android:layout_alignParentRight="true" 
+    android:layout_width="wrap_content" android:layout_height="wrap_content">
+      <ImageButton android:id="@+id/addVideo" android:src="@drawable/conf_video"
+        android:layout_width="wrap_content" android:layout_height="wrap_content" />
+      <ImageButton android:id="@+id/merge_to_conference" android:src="@drawable/conf_merge"
+        android:layout_width="wrap_content" android:layout_height="wrap_content" />
+      <ImageButton android:id="@+id/unhook_call" android:src="@drawable/conf_unhook"
+        android:layout_width="wrap_content" android:layout_height="wrap_content" />
+      <ImageButton android:id="@+id/terminate_call" android:src="@drawable/conf_terminate"
+        android:layout_width="wrap_content" android:layout_height="wrap_content" />
+      <ImageButton android:id="@+id/pause" android:src="@drawable/conf_pause"
+        android:layout_width="wrap_content" android:layout_height="wrap_content"/>
+      <ImageButton android:id="@+id/resume" android:src="@drawable/conf_resume"
+        android:layout_width="wrap_content" android:layout_height="wrap_content"/>
+    </LinearLayout>
+    
+    <LinearLayout android:layout_width="fill_parent" android:layout_height="fill_parent" android:orientation="vertical"
+    	android:layout_toLeftOf="@id/callee_buttons" android:layout_toRightOf="@id/picture">
+      <TextView android:id="@+id/name" android:layout_width="fill_parent" android:layout_height="wrap_content" />
+      <TextView android:id="@+id/address" android:layout_width="fill_parent" android:layout_height="wrap_content"/>
+    </LinearLayout>
+</RelativeLayout>
diff --git a/res/layout/conferencing.xml b/res/layout/conferencing.xml
new file mode 100644
index 000000000..5a78dfc63
--- /dev/null
+++ b/res/layout/conferencing.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+         android:orientation="vertical"
+         android:layout_width="fill_parent"
+         android:layout_height="fill_parent"
+         android:paddingLeft="8dp"
+         android:paddingRight="8dp">
+
+
+<RelativeLayout android:id="@+id/conf_header"
+  android:layout_width="fill_parent" android:layout_height="wrap_content" >
+    <LinearLayout android:id="@+id/conf_management_buttons" android:layout_alignParentRight="true" 
+       android:layout_width="wrap_content" android:layout_height="wrap_content">
+      <Button android:id="@+id/conf_enter_or_leave_button" android:layout_alignParentRight="true" 
+        android:layout_width="wrap_content" android:layout_height="wrap_content"/>
+      <ImageButton android:id="@+id/terminate_conference" android:src="@drawable/conf_terminate"
+        android:layout_width="wrap_content" android:layout_height="wrap_content" />
+    </LinearLayout>
+    
+    <LinearLayout android:layout_width="fill_parent" android:layout_height="wrap_content" android:orientation="vertical"
+    	android:layout_toLeftOf="@id/conf_management_buttons" android:layout_alignParentLeft="true">
+      <TextView android:text="@string/conf_text_you_host_a_conference"
+        android:layout_width="fill_parent" android:layout_height="wrap_content" />
+      <TextView android:id="@+id/conf_self_attending"
+        android:layout_width="fill_parent" android:layout_height="wrap_content"/>
+    </LinearLayout>
+</RelativeLayout>
+
+
+     <ListView android:id="@android:id/list"
+               android:layout_width="fill_parent"
+               android:layout_height="wrap_content"
+               android:layout_weight="1"
+               android:drawSelectorOnTop="false"/>
+
+	<LinearLayout android:orientation="horizontal" android:layout_width="fill_parent" android:layout_height="wrap_content"> 
+	<ToggleButton android:textOn="Mute" android:textOff="Mute" android:id="@+id/toggleMuteMic"
+	  android:width="0px" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_weight="1" />
+	<ToggleButton android:textOn="Speaker" android:textOff="Speaker" android:id="@+id/toggleSpeaker" 
+	  android:width="0px" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_weight="1" />
+	<ToggleButton android:textOn="Bluetooth" android:textOff="Bluetooth" android:id="@+id/toggleBluetooth" 
+	  android:width="0px" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_weight="1" />
+	</LinearLayout>
+
+<!--android:width="0px" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_weight="1-->
+
+	<LinearLayout android:layout_width="fill_parent" android:layout_height="wrap_content">
+		<Button android:text="+ Add call" android:id="@+id/addCall"
+	     android:layout_width="wrap_content" android:layout_height="wrap_content"
+	     />
+
+		<org.linphone.ui.HangCallButton android:id="@+id/incallHang" android:layout_width="wrap_content" android:layout_height="wrap_content"
+		 android:src="@drawable/mini_stopcall_red"  android:layout_weight="1" />
+		 
+		<Button android:id="@+id/incallNumpadShow" android:text="@string/show_send_dtmfs_button"  
+		 android:layout_width="wrap_content" android:layout_height="wrap_content"/>
+	</LinearLayout>
+
+
+ </LinearLayout>
diff --git a/res/layout/incall_view.xml b/res/layout/incall_view.xml
index 74a4bd303..714cf5cbf 100644
--- a/res/layout/incall_view.xml
+++ b/res/layout/incall_view.xml
@@ -24,9 +24,7 @@
 		</TableRow>
 		
 		<TableRow>
-		<org.linphone.ui.AddVideoButton android:id="@+id/AddVideo" android:src="@drawable/startvideo_green"
-		 android:layout_height="wrap_content" android:layout_width="wrap_content" android:height="10px"
-		 android:layout_column="1" />
+		
 		</TableRow>
 	</TableLayout>
 
@@ -34,8 +32,21 @@
 	</FrameLayout>
 
 	<View android:layout_weight="1" android:layout_width="0px" android:layout_height="0px" android:visibility="invisible"/>
+	
+	<LinearLayout android:orientation="horizontal" android:layout_width="fill_parent" android:layout_height="wrap_content"> 
+	<Button android:text="+ Add call" android:id="@+id/toggleButton4" android:width="0px" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_weight="1"/>
+	<Button android:text="Video" android:id="@+id/toggleButton4" android:width="0px" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_weight="1"/>
+	<Button android:text="Chat" android:id="@+id/toggleButton4" android:width="0px" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_weight="1"/>
+	</LinearLayout>
+	
+	<LinearLayout android:orientation="horizontal" android:layout_width="fill_parent" android:layout_height="wrap_content"> 
+	<ToggleButton android:text="Mute" android:id="@+id/toggleButton1" android:width="0px" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_weight="1"></ToggleButton>
+	<ToggleButton android:text="Speaker" android:id="@+id/toggleButton2" android:width="0px" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_weight="1"></ToggleButton>
+	<ToggleButton android:text="Bluetooth" android:id="@+id/toggleButton3" android:width="0px" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_weight="1"></ToggleButton>
+	</LinearLayout>
 
-
+<!--	<org.linphone.ui.AddVideoButton android:id="@+id/AddVideo" android:src="@drawable/startvideo_green"-->
+<!--		 android:layout_height="wrap_content" android:layout_width="fill_parent" android:width="0px" android:layout_weight="1"/>-->
 	<LinearLayout android:layout_width="fill_parent" android:layout_height="wrap_content">
 		<org.linphone.ui.HangCallButton android:id="@+id/incallHang" android:layout_width="wrap_content" android:layout_height="wrap_content"
 		 android:src="@drawable/stopcall_red" android:background="@drawable/clavier_bg" android:layout_weight="10" />
diff --git a/res/values/custom.xml b/res/values/custom.xml
index a5602db26..abc5529e9 100644
--- a/res/values/custom.xml
+++ b/res/values/custom.xml
@@ -10,7 +10,7 @@
     <bool name="useFirstLoginActivity">false</bool>
 	<bool name="useMenuSettings">true</bool>
 	<bool name="useMenuAbout">true</bool>
-	<bool name="use_incall_activity">false</bool>
+	<bool name="use_incall_activity">true</bool>
 	<bool name="use_video_activity">true</bool>
 	<bool name="show_full_remote_address_on_incoming_call">true</bool>
 
diff --git a/res/values/strings.xml b/res/values/strings.xml
index f715b4e77..4de957040 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1,6 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
+	<string name="show_send_dtmfs_button">DTMFs</string>
+
+	<string name="conf_text_you_host_a_conference">You host a conference</string>
+	<string name="in_conf">You are part of it</string>
+	<string name="in_conf_leave">Go out</string>
+	<string name="out_conf">You are out of it</string>
+	<string name="out_conf_enter">Go in</string>
+
 	<string name="pref_audio_hacks_title">Audio hacks</string>
 	<string name="pref_audio_use_specific_mode_title">Use specific mode hack</string>
 	<string name="pref_audio_use_specific_mode_summary">0=MODE_NORMAL (default), 2=MODE_IN_CALL</string>
diff --git a/src/org/linphone/ConferenceActivity.java b/src/org/linphone/ConferenceActivity.java
new file mode 100644
index 000000000..7178ed79d
--- /dev/null
+++ b/src/org/linphone/ConferenceActivity.java
@@ -0,0 +1,408 @@
+/*
+AbstractLinphoneConferenceActivity.java
+Copyright (C) 2011  Belledonne Communications, Grenoble, France
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+package org.linphone;
+
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+import org.linphone.LinphoneSimpleListener.LinphoneOnCallStateChangedListener;
+import org.linphone.core.LinphoneCall;
+import org.linphone.core.LinphoneCore;
+import org.linphone.core.LinphoneCoreException;
+import org.linphone.core.LinphoneCall.State;
+
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.app.ListActivity;
+import android.graphics.Color;
+import android.os.Bundle;
+import android.os.Handler;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.View.OnClickListener;
+import android.widget.BaseAdapter;
+import android.widget.TextView;
+import android.widget.Toast;
+
+public class ConferenceActivity extends ListActivity implements
+		LinphoneOnCallStateChangedListener, Comparator<LinphoneCall>,
+		OnClickListener {
+
+	private View confHeaderView;
+
+	// Start Override to test block
+	protected LinphoneCore lc() {
+		return LinphoneManager.getLc();
+	}
+
+	@SuppressWarnings("unchecked")
+	protected List<LinphoneCall> getInitialCalls() {
+		return lc().getCalls();
+	}
+
+	// End override to test block
+
+	private static final int ACTIVE_BG_COLOR = Color.parseColor("#777777");
+	public static final int INACTIVE_BG_COLOR = Color.BLACK;
+	public static final int INCOMING_BG_COLOR = Color.parseColor("#336600");
+	public static final int CONFERENCE_BG_COLOR = Color.parseColor("#444444");
+	private static final int numpad_dialog_id = 1;
+
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		setContentView(R.layout.conferencing);
+		super.onCreate(savedInstanceState);
+		confHeaderView = findViewById(R.id.conf_header);
+		confHeaderView.findViewById(R.id.terminate_conference)
+				.setOnClickListener(this);
+		confHeaderView.findViewById(R.id.conf_enter_or_leave_button)
+				.setOnClickListener(this);
+
+		findViewById(R.id.addCall).setOnClickListener(this);
+		findViewById(R.id.incallHang).setOnClickListener(this);
+
+		findViewById(R.id.incallNumpadShow).setOnClickListener(this);
+
+		List<LinphoneCall> calls = getInitialCalls();
+		setListAdapter(new CalleeListAdapter(calls));
+
+		updateConfState();
+	}
+
+	protected void registerLinphoneListener(boolean register) {
+		if (register)
+			LinphoneManager.getInstance().addListener(this);
+		else
+			LinphoneManager.getInstance().removeListener(this);
+	}
+
+	@Override
+	protected void onResume() {
+		registerLinphoneListener(true);
+		super.onResume();
+	}
+
+	@Override
+	protected void onPause() {
+		registerLinphoneListener(false);
+		super.onPause();
+	}
+
+	@Override
+	protected Dialog onCreateDialog(final int id) {
+		return new AlertDialog.Builder(this).setView(
+				getLayoutInflater().inflate(R.layout.numpad, null))
+		// .setIcon(R.drawable.logo_linphone_57x57)
+				// .setTitle("Send DTMFs")
+				// .setPositiveButton("hide", new
+				// DialogInterface.OnClickListener() {
+				// public void onClick(DialogInterface dialog, int whichButton)
+				// {
+				// dismissDialog(id);
+				// }
+				// })
+				.create();
+	}
+
+	// protected void conferenceMerge(boolean hostInTheConference, LinphoneCall
+	// ... calls) {
+	// for (LinphoneCall call: calls) {
+	// getLc().addToConference(call, false);
+	// }
+	// getLc().enterConference(hostInTheConference);
+	// }
+
+	// FIXME hack; should have an event?
+	protected final void hackTriggerConfStateUpdate() {
+		updateConfState();
+	}
+
+	private final void updateConfState() {
+		if (lc().getCallsNb() == 0)
+			finish();
+		boolean inConf = lc().isInConference();
+		confHeaderView.setBackgroundColor(inConf ? ACTIVE_BG_COLOR
+				: INACTIVE_BG_COLOR);
+
+		confHeaderView
+				.setVisibility(lc().getConferenceSize() > 0 ? View.VISIBLE
+						: View.GONE);
+
+		TextView v = (TextView) confHeaderView
+				.findViewById(R.id.conf_self_attending);
+		v.setText(inConf ? R.string.in_conf : R.string.out_conf);
+
+		v = (TextView) confHeaderView
+				.findViewById(R.id.conf_enter_or_leave_button);
+		v.setText(inConf ? R.string.in_conf_leave : R.string.out_conf_enter);
+	}
+
+	public void onClick(View v) {
+		switch (v.getId()) {
+		case R.id.addCall:
+			Toast.makeText(this,
+					"Should now finish this activity to go back to dialer",
+					Toast.LENGTH_LONG).show();
+			// startActivityForResult(new Intent().setClass(this,
+			// LinphoneContactSelectorActivity.class), 0);
+			break;
+		case R.id.conf_enter_or_leave_button:
+			if (lc().isInConference()) {
+				lc().leaveConference();
+			} else {
+				lc().enterConference();
+			}
+			break;
+		case R.id.terminate_conference:
+			lc().terminateConference();
+			findViewById(R.id.conf_header).setVisibility(View.GONE);
+			break;
+		case R.id.incallHang:
+			lc().terminateAllCalls();
+			finish();
+			break;
+		case R.id.incallNumpadShow:
+			showDialog(numpad_dialog_id);
+			break;
+		default:
+			break;
+		}
+
+	}
+
+	private class CalleeListAdapter extends BaseAdapter {
+		private List<LinphoneCall> linphoneCalls;
+
+		public CalleeListAdapter(List<LinphoneCall> calls) {
+			linphoneCalls = calls;
+
+		}
+
+		public int getCount() {
+			return linphoneCalls != null ? linphoneCalls.size() : 0;
+		}
+
+		public Object getItem(int position) {
+			return linphoneCalls.get(position);
+		}
+
+		public long getItemId(int position) {
+			return position;
+		}
+
+		private boolean aConferenceIsPossible() {
+			if (lc().getCallsNb() < 2)
+				return false;
+			int count = 0;
+			for (LinphoneCall call : linphoneCalls) {
+				int stateId = call.getState().value();
+				boolean connectionEstablished = stateId == State.ID_STREAMS_RUNNING
+						|| stateId == State.ID_PAUSED
+						|| stateId == State.ID_PAUSED_BY_REMOTE;
+				if (connectionEstablished)
+					count++;
+				if (count >= 2)
+					return true;
+			}
+			return false;
+		}
+
+		public View getView(int position, View v, ViewGroup parent) {
+			if (v == null) {
+				v = getLayoutInflater().inflate(R.layout.conf_callee, null);
+			}
+
+			LinphoneCall call = linphoneCalls.get(position);
+			int stateId = call.getState().value();
+
+			((TextView) v.findViewById(R.id.name)).setText(call
+					.getRemoteAddress().getDisplayName());
+			((TextView) v.findViewById(R.id.address)).setText(call
+					.getRemoteAddress().getUserName());
+
+			boolean isInConference = call.isInConference();
+			boolean currentlyActiveCall = !isInConference
+					&& stateId == State.ID_STREAMS_RUNNING;
+			int bgColor = INACTIVE_BG_COLOR;
+			if (stateId == State.ID_INCOMING_RECEIVED) {
+				bgColor = INCOMING_BG_COLOR;
+			} else if (currentlyActiveCall) {
+				bgColor = ACTIVE_BG_COLOR;
+			} else if (isInConference) {
+				bgColor = CONFERENCE_BG_COLOR;
+			}
+			v.setBackgroundColor(bgColor);
+
+			boolean connectionEstablished = stateId == State.ID_STREAMS_RUNNING
+					|| stateId == State.ID_PAUSED
+					|| stateId == State.ID_PAUSED_BY_REMOTE;
+			View confButton = v.findViewById(R.id.merge_to_conference);
+			boolean showMergeToConf = !isInConference && connectionEstablished
+					&& aConferenceIsPossible();
+			confButton
+					.setVisibility(showMergeToConf ? View.VISIBLE : View.GONE);
+
+			View unhookCallButton = v.findViewById(R.id.unhook_call);
+			boolean showUnhook = stateId == State.ID_INCOMING_RECEIVED;
+			unhookCallButton.setVisibility(showUnhook ? View.VISIBLE
+					: View.GONE);
+
+			View terminateCallButton = v.findViewById(R.id.terminate_call);
+			terminateCallButton.setVisibility(!isInConference ? View.VISIBLE
+					: View.GONE);
+
+			View pauseButton = v.findViewById(R.id.pause);
+			boolean showPause = !isInConference
+					&& call.getState().equals(State.StreamsRunning);
+			pauseButton.setVisibility(showPause ? View.VISIBLE : View.GONE);
+
+			View resumeButton = v.findViewById(R.id.resume);
+			boolean showResume = !isInConference
+					&& call.getState().equals(State.Paused);
+			resumeButton.setVisibility(showResume ? View.VISIBLE : View.GONE);
+
+			v.findViewById(R.id.addVideo).setVisibility(
+					!showUnhook && linphoneCalls.size() == 1 ? View.VISIBLE
+							: View.GONE);
+
+			createAndAttachCallViewClickListener(position, confButton,
+					unhookCallButton, terminateCallButton, pauseButton,
+					resumeButton);
+			return v;
+		}
+
+		private void createAndAttachCallViewClickListener(final int position,
+				final View confButton, final View unhookCallButton,
+				final View terminateCallButton, final View pauseButton,
+				final View resumeButton) {
+			OnClickListener l = new OnClickListener() {
+				public void onClick(View v) {
+					LinphoneCall call = linphoneCalls.get(position);
+					if (v == confButton) {
+						lc().addToConference(call);
+					} else if (v == terminateCallButton) {
+						lc().terminateCall(call);
+					} else if (v == pauseButton) {
+						lc().pauseCall(call);
+					} else if (v == resumeButton) {
+						lc().resumeCall(call);
+					} else if (v == unhookCallButton) {
+						LinphoneCall currentCall = lc().getCurrentCall();
+						if (currentCall != null) lc().pauseCall(currentCall);
+						try {
+							lc().acceptCall(call);
+						} catch (LinphoneCoreException e) {
+							throw new RuntimeException(e);
+						}
+					}
+				}
+			};
+			confButton.setOnClickListener(l);
+			terminateCallButton.setOnClickListener(l);
+			pauseButton.setOnClickListener(l);
+			resumeButton.setOnClickListener(l);
+			unhookCallButton.setOnClickListener(l);
+		}
+	}
+
+	private Handler mHandler = new Handler();
+
+	public void onCallStateChanged(final LinphoneCall call, final State state,
+			final String message) {
+		mHandler.post(new Runnable() {
+			public void run() {
+				CalleeListAdapter adapter = (CalleeListAdapter) getListAdapter();
+
+				switch (state.value()) {
+				case State.ID_INCOMING_RECEIVED:
+				case State.ID_OUTGOING_RINGING:
+					adapter.linphoneCalls.add(call);
+					Collections.sort(adapter.linphoneCalls,
+							ConferenceActivity.this);
+					adapter.notifyDataSetInvalidated();
+					break;
+				case State.ID_PAUSED:
+				case State.ID_PAUSED_BY_REMOTE:
+				case State.ID_STREAMS_RUNNING:
+					Collections.sort(adapter.linphoneCalls,
+							ConferenceActivity.this);
+					adapter.notifyDataSetChanged();
+					break;
+				case State.ID_CALL_END:
+					adapter.linphoneCalls.remove(call);
+					Collections.sort(adapter.linphoneCalls,
+							ConferenceActivity.this);
+					adapter.notifyDataSetInvalidated();
+					break;
+				default:
+					break;
+				}
+
+				updateConfState();
+			}
+		});
+	}
+
+	public int compare(LinphoneCall c1, LinphoneCall c2) {
+		if (c1 == c2)
+			return 0;
+
+		boolean inConfC1 = c1.isInConference();
+		boolean inConfC2 = c2.isInConference();
+		if (inConfC1 && !inConfC2)
+			return -1;
+		if (!inConfC1 && inConfC2)
+			return 1;
+
+		int durationDiff = c1.getDuration() - c2.getDuration();
+		return durationDiff;
+
+	}
+	/*
+	 * public int compare(LinphoneCall c1, LinphoneCall c2) { if (c1 == c2)
+	 * return 0;
+	 * 
+	 * boolean inConfC1 = c1.isInConference(); boolean inConfC2 =
+	 * c2.isInConference(); if (inConfC1 && !inConfC2) return -1; if (!inConfC1
+	 * && inConfC2) return 1;
+	 * 
+	 * int compUserName =
+	 * c1.getRemoteAddress().getUserName().compareToIgnoreCase
+	 * (c2.getRemoteAddress().getUserName()); if (inConfC1 && inConfC2) { return
+	 * compUserName; }
+	 * 
+	 * // bellow, ringings and incoming int c1State = c1.getState().value(); int
+	 * c2State = c2.getState().value();
+	 * 
+	 * boolean c1StateIsEstablishing = c1State == State.ID_INCOMING_RECEIVED ||
+	 * c1State == State.ID_OUTGOING_RINGING; boolean c2StateIsEstablishing =
+	 * c2State == State.ID_INCOMING_RECEIVED || c2State ==
+	 * State.ID_OUTGOING_RINGING;
+	 * 
+	 * // Xor only one establishing state if (c1StateIsEstablishing ^
+	 * c2StateIsEstablishing) { // below return !c1StateIsEstablishing ? -1 : 1;
+	 * }
+	 * 
+	 * // Xor only one paused state if (c1State == State.ID_PAUSED ^ c2State ==
+	 * State.ID_PAUSED) { return c1State == State.ID_PAUSED ? -1 : 1; }
+	 * 
+	 * return compUserName; //Duration() - c1.getDuration(); }
+	 */
+}
diff --git a/src/org/linphone/DialerActivity.java b/src/org/linphone/DialerActivity.java
index 3aa7d2cd9..8027d4449 100644
--- a/src/org/linphone/DialerActivity.java
+++ b/src/org/linphone/DialerActivity.java
@@ -21,6 +21,7 @@ package org.linphone;
 import org.linphone.LinphoneManager.NewOutgoingCallUiListener;
 import org.linphone.LinphoneService.LinphoneGuiListener;
 import org.linphone.core.CallDirection;
+import org.linphone.core.LinphoneAddress;
 import org.linphone.core.LinphoneCall;
 import org.linphone.core.LinphoneCore;
 import org.linphone.core.Log;
@@ -219,7 +220,8 @@ public class DialerActivity extends LinphoneManagerWaitActivity implements Linph
 
 	
 	private void enterIncallMode(LinphoneCore lc) {
-		mDisplayNameView.setText(LinphoneManager.getInstance().extractADisplayName());
+		LinphoneAddress address = LinphoneManager.getLc().getRemoteAddress();
+		mDisplayNameView.setText(LinphoneManager.extractADisplayName(getResources(), address));
 
 //		setVolumeControlStream(AudioManager.STREAM_VOICE_CALL);
 
@@ -227,8 +229,9 @@ public class DialerActivity extends LinphoneManagerWaitActivity implements Linph
 		if (!mWakeLock.isHeld()) mWakeLock.acquire();
 		
 		if (useIncallActivity) {
-			LinphoneActivity.instance().startIncallActivity(
-				mDisplayNameView.getText(), mAddress.getPictureUri());
+//			LinphoneActivity.instance().startIncallActivity(
+//				mDisplayNameView.getText(), mAddress.getPictureUri());
+			LinphoneActivity.instance().startConferenceActivity();
 		} else {
 			loadMicAndSpeakerUiStateFromManager();
 			mCallControlRow.setVisibility(View.GONE);
@@ -319,6 +322,8 @@ public class DialerActivity extends LinphoneManagerWaitActivity implements Linph
 	@Override
 	protected Dialog onCreateDialog(int id) {
 		if (id == incomingCallDialogId) {
+			LinphoneAddress address = LinphoneManager.getLc().getRemoteAddress();
+			String from = LinphoneManager.extractIncomingRemoteName(getResources(), address);
 			View incomingCallView = getLayoutInflater().inflate(R.layout.incoming_call, null);
 
 			final Dialog dialog = new AlertDialog.Builder(this)
diff --git a/src/org/linphone/LinphoneActivity.java b/src/org/linphone/LinphoneActivity.java
index c7e63a0ef..1f5a3b84a 100644
--- a/src/org/linphone/LinphoneActivity.java
+++ b/src/org/linphone/LinphoneActivity.java
@@ -24,6 +24,7 @@ import static android.content.Intent.ACTION_MAIN;
 import java.util.List;
 
 import org.linphone.LinphoneManager.EcCalibrationListener;
+import org.linphone.core.LinphoneAddress;
 import org.linphone.core.LinphoneCore;
 import org.linphone.core.LinphoneCoreException;
 import org.linphone.core.Log;
@@ -66,6 +67,7 @@ public class LinphoneActivity extends TabActivity implements SensorEventListener
     static final int FIRST_LOGIN_ACTIVITY = 101;
     static final int INCALL_ACTIVITY = 102;
     static final int INCOMING_CALL_ACTIVITY = 103;
+	private static final int conference_activity = 104;
     private static final String PREF_CHECK_CONFIG = "pref_check_config";
 
 	private static LinphoneActivity instance;
@@ -141,7 +143,7 @@ public class LinphoneActivity extends TabActivity implements SensorEventListener
 		
 	    if (savedInstanceState !=null && savedInstanceState.getBoolean(SCREEN_IS_HIDDEN,false)) {
 	    	hideScreen(true);
-	    }	
+	    }
 	}
 	
 	
@@ -217,7 +219,8 @@ public class LinphoneActivity extends TabActivity implements SensorEventListener
 				gotToDialer();
 			} else {
 				if (getResources().getBoolean(R.bool.use_incall_activity)) {
-					startIncallActivity(LinphoneManager.getInstance().extractADisplayName(), null);
+					LinphoneAddress address = LinphoneManager.getLc().getRemoteAddress();
+					startIncallActivity(LinphoneManager.getInstance().extractADisplayName(getResources(), address), null);
 				} else {
 					// TODO
 					Log.e("Not handled case: recreation while in call and not using incall activity");
@@ -478,11 +481,13 @@ public class LinphoneActivity extends TabActivity implements SensorEventListener
 	}
 
 	public void startIncallActivity(CharSequence callerName, Uri pictureUri) {
-		Intent intent = new Intent().setClass(this, IncallActivity.class)
+/*		Intent intent = new Intent().setClass(this, IncallActivity.class)
                                 .putExtra(IncallActivity.CONTACT_KEY, callerName);
 		if (pictureUri != null)
 			intent.putExtra(IncallActivity.PICTURE_URI_KEY, pictureUri.toString());
-		startActivityForResult(intent, INCALL_ACTIVITY);
+		startActivityForResult(intent, INCALL_ACTIVITY);*/
+		// Hacked
+		startConferenceActivity();
 	}
 
 	public void closeIncallActivity() {
@@ -490,7 +495,6 @@ public class LinphoneActivity extends TabActivity implements SensorEventListener
 	}
 
 	public void startVideoActivity() {
-		
 		mHandler.post(new Runnable() {
 			public void run() {
 				startActivityForResult(new Intent().setClass(
@@ -501,6 +505,17 @@ public class LinphoneActivity extends TabActivity implements SensorEventListener
 		});
 		LinphoneManager.getInstance().routeAudioToSpeaker();
 	}
+
+	public void startConferenceActivity() {
+		mHandler.post(new Runnable() {
+			public void run() {
+				startActivityForResult(new Intent().setClass(
+						LinphoneActivity.this,
+						ConferenceActivity.class),
+						conference_activity);
+				}
+		});
+	}
 	
 	public void finishVideoActivity() {
 		mHandler.post(new Runnable() {
@@ -509,4 +524,5 @@ public class LinphoneActivity extends TabActivity implements SensorEventListener
 			}
 		});
 	}
+
 }
diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java
index 0fa9acef7..ac15fcd08 100644
--- a/src/org/linphone/LinphoneManager.java
+++ b/src/org/linphone/LinphoneManager.java
@@ -39,9 +39,13 @@ import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Timer;
 import java.util.TimerTask;
 
+import org.linphone.LinphoneSimpleListener.LinphoneServiceListener;
+import org.linphone.core.Hacks;
 import org.linphone.core.LinphoneAddress;
 import org.linphone.core.LinphoneAuthInfo;
 import org.linphone.core.LinphoneCall;
@@ -116,7 +120,17 @@ public final class LinphoneManager implements LinphoneCoreListener {
 	private String basePath;
 	private static boolean sExited;
 
-	
+	private List<LinphoneSimpleListener> simpleListeners = new ArrayList<LinphoneSimpleListener>();
+	public void addListener(LinphoneSimpleListener listener) {
+		if (!simpleListeners.contains(listener)) {
+			simpleListeners.add(listener);
+		}
+	}
+	public void removeListener(LinphoneSimpleListener listener) {
+		simpleListeners.remove(listener);
+	}
+
+
 	private LinphoneManager(final Context c) {
 		sExited=false;
 		basePath = c.getFilesDir().getAbsolutePath();
@@ -203,14 +217,14 @@ public final class LinphoneManager implements LinphoneCoreListener {
 			}
 		}
 	}
-	
+
 	public synchronized static final LinphoneManager createAndStart(
 			Context c, LinphoneServiceListener listener) {
 		if (instance != null)
 			throw new RuntimeException("Linphone Manager is already initialized");
 
 		instance = new LinphoneManager(c);
-		instance.serviceListener = listener;
+		instance.listenerDispatcher.setServiceListener(listener);
 		instance.startLibLinphone(c);
 		
 		if (Version.isVideoCapable())
@@ -245,14 +259,14 @@ public final class LinphoneManager implements LinphoneCoreListener {
 		String to = address.getText().toString();
 
 		if (mLc.isIncall()) {
-			serviceListener.tryingNewOutgoingCallButAlreadyInCall();
+			listenerDispatcher.tryingNewOutgoingCallButAlreadyInCall();
 			return;
 		}
 		LinphoneAddress lAddress;
 		try {
 			lAddress = mLc.interpretUrl(to);
 		} catch (LinphoneCoreException e) {
-			serviceListener.tryingNewOutgoingCallButWrongDestinationAddress();
+			listenerDispatcher.tryingNewOutgoingCallButWrongDestinationAddress();
 			return;
 		}
 		lAddress.setDisplayName(address.getDisplayedName());
@@ -269,7 +283,7 @@ public final class LinphoneManager implements LinphoneCoreListener {
 			
 
 		} catch (LinphoneCoreException e) {
-			serviceListener.tryingNewOutgoingCallButCannotGetCallParameters();
+			listenerDispatcher.tryingNewOutgoingCallButCannotGetCallParameters();
 			return;
 		}
 	}
@@ -646,25 +660,11 @@ public final class LinphoneManager implements LinphoneCoreListener {
 	
 	
 	
-	public interface LinphoneServiceListener {
-		void onGlobalStateChanged(GlobalState state, String message);
-		void tryingNewOutgoingCallButCannotGetCallParameters();
-		void tryingNewOutgoingCallButWrongDestinationAddress();
-		void tryingNewOutgoingCallButAlreadyInCall();
-		void onRegistrationStateChanged(RegistrationState state, String message);
-		void onCallStateChanged(LinphoneCall call, State state, String message);
-		void onRingerPlayerCreated(MediaPlayer mRingerPlayer);
-		void onDisplayStatus(String message);
-		void onAlreadyInVideoCall();
-		void onCallEncryptionChanged(LinphoneCall call, boolean encrypted,
-				String authenticationToken);
-	}
-
 	public interface EcCalibrationListener {
 		void onEcCalibrationStatus(EcCalibratorStatus status, int delayMs);
 	}
 
-	private LinphoneServiceListener serviceListener;
+	private ListenerDispatcher listenerDispatcher = new ListenerDispatcher(simpleListeners);
 	private LinphoneCall.State mCurrentCallState;
 
 	private MediaPlayer mRingerPlayer;
@@ -689,32 +689,31 @@ public final class LinphoneManager implements LinphoneCoreListener {
 	public void displayStatus(final LinphoneCore lc, final String message) {
 		Log.i(message);
 		lastLcStatusMessage=message;
-		serviceListener.onDisplayStatus(message);
+		listenerDispatcher.onDisplayStatus(message);
 	}
 
 
 	public void globalState(final LinphoneCore lc, final LinphoneCore.GlobalState state, final String message) {
 		Log.i("new state [",state,"]");
-		serviceListener.onGlobalStateChanged(state, message);
+		listenerDispatcher.onGlobalStateChanged(state, message);
 	}
 
 
 
 	public void registrationState(final LinphoneCore lc, final LinphoneProxyConfig cfg,final LinphoneCore.RegistrationState state,final String message) {
 		Log.i("new state ["+state+"]");
-		serviceListener.onRegistrationStateChanged(state, message);
+		listenerDispatcher.onRegistrationStateChanged(state, message);
 	}
 
 
 	public void callState(final LinphoneCore lc,final LinphoneCall call, final State state, final String message) {
 		Log.i("new state [",state,"]");
 		if (state == IncomingReceived && !call.equals(lc.getCurrentCall())) {
-			if (call.getReplacedCall()==null){
-				//no multicall support, just decline
-				lc.terminateCall(call);
-			}//otherwise it will be accepted automatically.
-			
-			return;
+			if (call.getReplacedCall()!=null){
+				// attended transfer
+				// it will be accepted automatically.
+				return;
+			} 
 		}
 
 		if (state == IncomingReceived) {
@@ -746,12 +745,12 @@ public final class LinphoneManager implements LinphoneCoreListener {
 		}
 
 		mCurrentCallState=state;
-		serviceListener.onCallStateChanged(call, state, message);
+		listenerDispatcher.onCallStateChanged(call, state, message);
 	}
 
 	public void callEncryptionChanged(LinphoneCore lc, LinphoneCall call,
 			boolean encrypted, String authenticationToken) {
-		serviceListener.onCallEncryptionChanged(call, encrypted, authenticationToken);
+		listenerDispatcher.onCallEncryptionChanged(call, encrypted, authenticationToken);
 	}
 
 	public void ecCalibrationStatus(final LinphoneCore lc,final EcCalibratorStatus status, final int delayMs,
@@ -793,7 +792,7 @@ public final class LinphoneManager implements LinphoneCoreListener {
 			if (mRingerPlayer == null) {
 				mRingerPlayer = new MediaPlayer();
 				mRingerPlayer.setAudioStreamType(STREAM_RING);
-				serviceListener.onRingerPlayerCreated(mRingerPlayer);
+				listenerDispatcher.onRingerPlayerCreated(mRingerPlayer);
 				mRingerPlayer.prepare();
 				mRingerPlayer.setLooping(true);
 				mRingerPlayer.start();
@@ -820,21 +819,20 @@ public final class LinphoneManager implements LinphoneCoreListener {
 	}
 
 	
-	public String extractADisplayName() {
-		final LinphoneAddress remote = mLc.getRemoteAddress();
-		if (remote == null) return mR.getString(R.string.unknown_incoming_call_name);
+	public static String extractADisplayName(Resources r, LinphoneAddress address) {
+		if (address == null) return r.getString(R.string.unknown_incoming_call_name);
 
-		final String displayName = remote.getDisplayName();
+		final String displayName = address.getDisplayName();
 		if (displayName!=null) {
 			return displayName;
-		} else  if (remote.getUserName() != null){
-			return remote.getUserName();
+		} else  if (address.getUserName() != null){
+			return address.getUserName();
 		} else {
-			String rms = remote.toString();
+			String rms = address.toString();
 			if (rms != null && rms.length() > 1)
 				return rms;
 				
-			return mR.getString(R.string.unknown_incoming_call_name);
+			return r.getString(R.string.unknown_incoming_call_name);
 		}
 	}
 
@@ -887,7 +885,7 @@ public final class LinphoneManager implements LinphoneCoreListener {
 	public void addVideo() {
 		if (!LinphoneManager.getLc().isIncall()) return;
 		if (!reinviteWithVideo()) {
-			serviceListener.onAlreadyInVideoCall();
+			listenerDispatcher.onAlreadyInVideoCall();
 		}
 	}
 
@@ -902,15 +900,14 @@ public final class LinphoneManager implements LinphoneCoreListener {
 		return false;
 	}
 
-	public String extractIncomingRemoteName() {
-		if (!mR.getBoolean(R.bool.show_full_remote_address_on_incoming_call))
-			return extractADisplayName();
+	public static String extractIncomingRemoteName(Resources r, LinphoneAddress linphoneAddress) {
+		if (!r.getBoolean(R.bool.show_full_remote_address_on_incoming_call))
+			return extractADisplayName(r, linphoneAddress);
 
-		LinphoneAddress remote = mLc.getRemoteAddress();
-		if (remote != null)
-			return remote.toString();
+		if (linphoneAddress != null)
+			return linphoneAddress.toString();
 
-		return mR.getString(R.string.unknown_incoming_call_name);
+		return r.getString(R.string.unknown_incoming_call_name);
 	}
 
 	public void adjustSoftwareVolume(int i) {
@@ -948,4 +945,71 @@ public final class LinphoneManager implements LinphoneCoreListener {
 		return getLc();
 	}
 
+	private static class ListenerDispatcher implements LinphoneServiceListener {
+		private LinphoneServiceListener serviceListener;
+		List<LinphoneSimpleListener> simpleListeners;
+		public ListenerDispatcher(List<LinphoneSimpleListener> simpleListeners) {
+			this.simpleListeners = simpleListeners;
+		}
+
+		@SuppressWarnings("unchecked")
+		private <T> List<T> getSimpleListeners(Class<T> clazz) {
+			List<T> list = new ArrayList<T>();
+			for (LinphoneSimpleListener l : simpleListeners) {
+				if (clazz.isInstance(l)) list.add((T) l);
+			}
+			return list;
+		}
+
+		public void setServiceListener(LinphoneServiceListener s) {
+			this.serviceListener = s;
+		}
+
+		public void onAlreadyInVideoCall() {
+			if (serviceListener != null) serviceListener.onAlreadyInVideoCall();
+		}
+
+		public void onCallEncryptionChanged(LinphoneCall call,
+				boolean encrypted, String authenticationToken) {
+			if (serviceListener != null) serviceListener.onCallEncryptionChanged(call, encrypted, authenticationToken);
+		}
+
+		public void onCallStateChanged(LinphoneCall call, State state,
+				String message) {
+			if (serviceListener != null) serviceListener.onCallStateChanged(call, state, message);
+			for (LinphoneOnCallStateChangedListener l : getSimpleListeners(LinphoneOnCallStateChangedListener.class)) {
+				l.onCallStateChanged(call, state, message);
+			}
+		}
+
+		public void onDisplayStatus(String message) {
+			if (serviceListener != null) serviceListener.onDisplayStatus(message);
+		}
+
+		public void onGlobalStateChanged(GlobalState state, String message) {
+			if (serviceListener != null) serviceListener.onGlobalStateChanged( state, message);
+		}
+
+		public void onRegistrationStateChanged(RegistrationState state,
+				String message) {
+			if (serviceListener != null) serviceListener.onRegistrationStateChanged(state, message);
+		}
+
+		public void onRingerPlayerCreated(MediaPlayer mRingerPlayer) {
+			if (serviceListener != null) serviceListener.onRingerPlayerCreated(mRingerPlayer);
+		}
+
+		public void tryingNewOutgoingCallButAlreadyInCall() {
+			if (serviceListener != null) serviceListener.tryingNewOutgoingCallButAlreadyInCall();
+		}
+
+		public void tryingNewOutgoingCallButCannotGetCallParameters() {
+			if (serviceListener != null) serviceListener.tryingNewOutgoingCallButCannotGetCallParameters();
+		}
+
+		public void tryingNewOutgoingCallButWrongDestinationAddress() {
+			if (serviceListener != null) serviceListener.tryingNewOutgoingCallButWrongDestinationAddress();
+		}
+		
+	}
 }
diff --git a/src/org/linphone/LinphoneService.java b/src/org/linphone/LinphoneService.java
index b06b66025..4e0b1c9e8 100644
--- a/src/org/linphone/LinphoneService.java
+++ b/src/org/linphone/LinphoneService.java
@@ -20,8 +20,9 @@ package org.linphone;
 
 import java.io.IOException;
 
-import org.linphone.LinphoneManager.LinphoneServiceListener;
 import org.linphone.LinphoneManager.NewOutgoingCallUiListener;
+import org.linphone.LinphoneSimpleListener.LinphoneServiceListener;
+import org.linphone.core.Hacks;
 import org.linphone.core.LinphoneCall;
 import org.linphone.core.Log;
 import org.linphone.core.OnlineStatus;
diff --git a/src/org/linphone/LinphoneSimpleListener.java b/src/org/linphone/LinphoneSimpleListener.java
new file mode 100644
index 000000000..d64b2bb3b
--- /dev/null
+++ b/src/org/linphone/LinphoneSimpleListener.java
@@ -0,0 +1,50 @@
+/*
+LinphoneServiceListener.java
+Copyright (C) 2011  Belledonne Communications, Grenoble, France
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+package org.linphone;
+
+import org.linphone.core.LinphoneCall;
+import org.linphone.core.LinphoneCall.State;
+import org.linphone.core.LinphoneCore.GlobalState;
+import org.linphone.core.LinphoneCore.RegistrationState;
+
+import android.media.MediaPlayer;
+
+public interface LinphoneSimpleListener {
+
+	public static interface LinphoneServiceListener
+	extends LinphoneOnGlobalStateChangedListener, LinphoneOnCallStateChangedListener {
+		void tryingNewOutgoingCallButCannotGetCallParameters();
+		void tryingNewOutgoingCallButWrongDestinationAddress();
+		void tryingNewOutgoingCallButAlreadyInCall();
+		void onRegistrationStateChanged(RegistrationState state, String message);
+		void onRingerPlayerCreated(MediaPlayer mRingerPlayer);
+		void onDisplayStatus(String message);
+		void onAlreadyInVideoCall();
+		void onCallEncryptionChanged(LinphoneCall call, boolean encrypted, String authenticationToken);
+		
+	}
+	
+	public static interface LinphoneOnGlobalStateChangedListener extends LinphoneSimpleListener {
+		void onGlobalStateChanged(GlobalState state, String message);
+	}
+
+	public static interface LinphoneOnCallStateChangedListener extends LinphoneSimpleListener {
+		void onCallStateChanged(LinphoneCall call, State state, String message);
+	}
+}
diff --git a/src/org/linphone/core/LinphoneCallImpl.java b/src/org/linphone/core/LinphoneCallImpl.java
index 70968e79d..acad5a09f 100644
--- a/src/org/linphone/core/LinphoneCallImpl.java
+++ b/src/org/linphone/core/LinphoneCallImpl.java
@@ -123,8 +123,9 @@ class LinphoneCallImpl implements LinphoneCall {
 	public boolean areStreamsEncrypted() {
 		return areStreamsEncrypted(nativePtr);
 	}
+
 	public boolean isInConference() {
-		// TODO Auto-generated method stub
-		return false;
+		LinphoneCallParamsImpl params = new LinphoneCallParamsImpl(getCurrentParamsCopy(nativePtr));
+		return params.localConferenceMode();
 	}
 }
diff --git a/src/org/linphone/core/LinphoneCallParamsImpl.java b/src/org/linphone/core/LinphoneCallParamsImpl.java
index ef05eb228..d9c490ae1 100644
--- a/src/org/linphone/core/LinphoneCallParamsImpl.java
+++ b/src/org/linphone/core/LinphoneCallParamsImpl.java
@@ -48,4 +48,9 @@ public class LinphoneCallParamsImpl implements LinphoneCallParams {
 	public void setAudioBandwidth(int value) {
 		audioBandwidth(nativePtr, value);
 	}
+
+	private native boolean localConferenceMode(long nativePtr);
+	public boolean localConferenceMode() {
+		return localConferenceMode(nativePtr);
+	}
 }
diff --git a/src/org/linphone/core/LinphoneCoreImpl.java b/src/org/linphone/core/LinphoneCoreImpl.java
index 92eb4a43c..ab87a17b2 100644
--- a/src/org/linphone/core/LinphoneCoreImpl.java
+++ b/src/org/linphone/core/LinphoneCoreImpl.java
@@ -20,6 +20,7 @@ package org.linphone.core;
 
 import java.io.File;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Vector;
 
@@ -488,50 +489,68 @@ class LinphoneCoreImpl implements LinphoneCore {
 	public int getVideoDevice() {
 		return getVideoDevice(nativePtr);
 	}
-	public void addAllToConference() {
-		// TODO Auto-generated method stub
-		
-	}
-	public void addToConference(LinphoneCall call) {
-		// TODO Auto-generated method stub
-		
-	}
-	public void enterConference() {
-		// TODO Auto-generated method stub
-		
-	}
-	public List getCalls() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-	public int getCallsNb() {
-		// TODO Auto-generated method stub
-		return 0;
-	}
-	public int getConferenceSize() {
-		// TODO Auto-generated method stub
-		return 0;
-	}
-	public boolean isInConference() {
-		// TODO Auto-generated method stub
-		return false;
-	}
+
+
+	private native void leaveConference(long nativePtr);	
 	public void leaveConference() {
-		// TODO Auto-generated method stub
-		
+		leaveConference(nativePtr);
 	}
-	public void removeFromConference(LinphoneCall call) {
-		// TODO Auto-generated method stub
-		
+
+	private native void enterConference(long nativePtr);	
+	public void enterConference() {
+		enterConference(nativePtr);
 	}
-	public void terminateAllCalls() {
-		// TODO Auto-generated method stub
-		
+
+	private native boolean isInConference(long nativePtr);
+	public boolean isInConference() {
+		return isInConference(nativePtr);
 	}
+
+	private native void addToConference(long nativePtr, long nativePtrLcall);
+	public void addToConference(LinphoneCall call, boolean addOthersToNewConference) {
+		addToConference(nativePtr, ((LinphoneCallImpl)call).nativePtr);
+	}
+
+	private native void terminateConference(long nativePtr);
 	public void terminateConference() {
-		// TODO Auto-generated method stub
+		terminateConference(nativePtr);
+	}
+	private native int getConferenceSize(long nativePtr);
+	public int getConferenceSize() {
+		return getConferenceSize(nativePtr);
+	}
+	private native int getCallsNb(long nativePtr);
+	public int getCallsNb() {
+		return getCallsNb(nativePtr);
+	}
+	private native void terminateAllCalls(long nativePtr);
+	public void terminateAllCalls() {
+		terminateAllCalls(nativePtr);
+	}
+	private native long getCall(long nativePtr, int position);
+	@SuppressWarnings("unchecked") public List getCalls() {
+		int size = getCallsNb(nativePtr);
+		List<LinphoneCall> calls = new ArrayList<LinphoneCall>(size);
+		for (int i=0; i < size; i++) {
+			calls.add(new LinphoneCallImpl(getCall(nativePtr, i)));
+		}
+		return calls;
+	}
+	private native void addAllToConference(long nativePtr);
+	public void addAllToConference() {
+		addAllToConference(nativePtr);
 		
 	}
+	private native void addToConference(long nativePtr);
+	public void addToConference(LinphoneCall call) {
+		addToConference(nativePtr);
+		
+	}
+	private native void removeFromConference(long nativePtr);
+	public void removeFromConference(LinphoneCall call) {
+		removeFromConference(nativePtr);
+	}
+
 	public void transferCall(LinphoneCall call, String referTo) {
 		// TODO Auto-generated method stub
 		
diff --git a/test/org/linphone/TestConferenceActivity.java b/test/org/linphone/TestConferenceActivity.java
new file mode 100644
index 000000000..212cdaf71
--- /dev/null
+++ b/test/org/linphone/TestConferenceActivity.java
@@ -0,0 +1,350 @@
+/*
+TestIncallCalleeBoxes.java
+Copyright (C) 2011  Belledonne Communications, Grenoble, France
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+package org.linphone;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import org.linphone.core.CallDirection;
+import org.linphone.core.LinphoneAddress;
+import org.linphone.core.LinphoneAuthInfo;
+import org.linphone.core.LinphoneCall;
+import org.linphone.core.LinphoneCallLog;
+import org.linphone.core.LinphoneCallParams;
+import org.linphone.core.LinphoneChatRoom;
+import org.linphone.core.LinphoneCore;
+import org.linphone.core.LinphoneCoreException;
+import org.linphone.core.LinphoneFriend;
+import org.linphone.core.LinphoneProxyConfig;
+import org.linphone.core.OnlineStatus;
+import org.linphone.core.PayloadType;
+import org.linphone.core.VideoSize;
+import org.linphone.core.LinphoneCall.State;
+
+import android.os.Bundle;
+import android.os.Handler;
+
+/**
+ * @author Guillaume Beraudo
+ */
+public class TestConferenceActivity extends ConferenceActivity {
+
+	private Handler mHandler = new Handler();
+	private LinphoneCoreTest mTestLc;
+	protected final LinphoneCore lc() {return mTestLc;}
+
+	private void simulateCallAccepted(final LinphoneCall call, int millis) {
+		mHandler.postDelayed(new Runnable() {
+			public void run() {
+				lc().pauseAllCalls();
+				((LinphoneCallTest)call).state = State.StreamsRunning;
+				onCallStateChanged(call, call.getState(), "simulated out call answered");
+			}
+		}, millis);
+	}
+
+	protected final List<LinphoneCall> getInitialCalls() {
+		List<LinphoneCall> calls = new ArrayList<LinphoneCall>();
+		int duration=0;
+		mTestLc = new LinphoneCoreTest(calls);
+		calls.add(new LinphoneCallTest(duration++, "Tartampion", "06.25.45.98.54", State.StreamsRunning));
+		calls.add(new LinphoneCallTest(duration++, "Durand", "durand@sip.linphone.org", State.StreamsRunning));
+		//	calls.add(new LinphoneCallTest(duration++, "Poupoux", "01.58.68.75.32", State.StreamsRunning));
+		calls.add(new LinphoneCallTest(duration++, "Tante Germaine", "+33 1.58.68.75.32", State.Paused));
+		//	calls.add(new LinphoneCallTest(duration++, "M. Le président ", "3615 Elysée", State.Paused));
+		calls.add(new LinphoneCallTest(duration++, "01.58.68.75.32", "01.58.68.75.32", State.StreamsRunning));
+		calls.add(new LinphoneCallTest(duration++, "A ringing out guy", "out-ringing@sip.linphone.org", State.OutgoingRinging));
+		calls.add(new LinphoneCallTest(duration++, "A calling in guy", "in@sip.linphone.org", State.IncomingReceived));
+
+		((LinphoneCallTest)calls.get(0)).inConf=true;
+		((LinphoneCallTest)calls.get(1)).inConf=true;
+
+		simulateCallAccepted(calls.get(4), 5000);
+		Collections.sort(calls, this);
+
+		mTestLc = new LinphoneCoreTest(calls);
+		return calls;
+	}
+
+
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+
+		//if (!serviceStarted) startService(new Intent(ACTION_MAIN).setClass(this, LinphoneService.class));
+
+	}
+
+
+
+	
+	private class LinphoneCoreTest implements LinphoneCore {
+		List<LinphoneCall> calls;
+		public LinphoneCoreTest(List<LinphoneCall> calls) {
+			this.calls = new ArrayList<LinphoneCall>(calls);
+			//don't keep only the list reference (concurrent access in onStateChanged).
+		}
+		public void acceptCall(LinphoneCall call) throws LinphoneCoreException {
+			if (isInConference()) {
+				leaveConference();
+			} else {
+				pauseCall(getCurrentCall());
+			}
+			changeState(call, State.StreamsRunning);
+		}
+		public void addAuthInfo(LinphoneAuthInfo info) {}
+		public void addFriend(LinphoneFriend lf) throws LinphoneCoreException {}
+		public void addProxyConfig(LinphoneProxyConfig p) throws LinphoneCoreException {}
+		public void adjustSoftwareVolume(int i) {}
+		public void clearAuthInfos() {}
+		public void clearCallLogs() {}
+		public void clearProxyConfigs() {}
+		public LinphoneChatRoom createChatRoom(String to) {return null;}
+		public LinphoneCallParams createDefaultCallParameters() {return null;}
+		public void destroy() {}
+		public void enableEchoCancellation(boolean enable) {}
+		public void enableEchoLimiter(boolean val) {}
+		public void enableIpv6(boolean enable) {}
+		public void enableKeepAlive(boolean enable) {}
+		public void enablePayloadType(PayloadType pt, boolean e)throws LinphoneCoreException {}
+		public void enableSpeaker(boolean value) {}
+		public void enableVideo(boolean vcapEnabled, boolean displayEnabled) {}
+		public PayloadType findPayloadType(String mime, int clockRate) {return null;}
+		public PayloadType[] getAudioCodecs() {return null;}
+		@SuppressWarnings("unchecked")
+		public List getCallLogs() {return null;}
+		public LinphoneCall getCurrentCall() {
+			LinphoneCall active = null;
+			for (LinphoneCall call : calls) {
+				if (call.isInConference() || !call.getState().equals(State.StreamsRunning)) continue;
+				if (active != null) throw new RuntimeException("There are several active calls!");
+				active = call;
+			}
+			return active;
+		}
+		public LinphoneProxyConfig getDefaultProxyConfig() {return null;}
+		public FirewallPolicy getFirewallPolicy() {return null;}
+		public int getPlayLevel() {return 0;}
+		public float getPlaybackGain() {return 0;}
+		public VideoSize getPreferredVideoSize() {return null;}
+		public LinphoneAddress getRemoteAddress() {return null;}
+		public String getRing() {return null;}
+		public Transports getSignalingTransportPorts() {return null;}
+		public String getStunServer() {return null;}
+		public PayloadType[] getVideoCodecs() {return null;}
+		public LinphoneAddress interpretUrl(String d)throws LinphoneCoreException {return null;}
+		public LinphoneCall invite(String d) throws LinphoneCoreException {return null;}
+		public LinphoneCall invite(LinphoneAddress to)throws LinphoneCoreException {return null;}
+		public LinphoneCall inviteAddressWithParams(LinphoneAddress d, LinphoneCallParams p)
+		throws LinphoneCoreException {return null;}
+		public boolean isEchoCancellationEnabled() {return false;}
+		public boolean isInComingInvitePending() {return false;}
+		public boolean isIncall() {return false;}
+		public boolean isKeepAliveEnabled() {return false;}
+		public boolean isMicMuted() {return false;}
+		public boolean isNetworkReachable() {return false;}
+		public boolean isSpeakerEnabled() {return false;}
+		public boolean isVideoEnabled() {return false;}
+		public void iterate() {}
+		public void muteMic(boolean isMuted) {}
+		public boolean pauseAllCalls() {
+			// FIXME may not be right
+			for (LinphoneCall call : calls) {
+				if (!call.isInConference()) {
+					if (call.getState().equals(State.StreamsRunning) || call.getState().equals(State.PausedByRemote))
+						pauseCall(call);
+				}
+			}
+			return false;
+		}
+		public boolean pauseCall(LinphoneCall call) {
+			changeState(call, State.Paused);
+			return true;
+		}
+		public void playDtmf(char number, int duration) {}
+		public boolean resumeCall(LinphoneCall call) {
+			pauseAllCalls();
+			changeState(call, State.StreamsRunning);
+			return true;
+		}
+		public void sendDtmf(char number) {}
+		public void setDefaultProxyConfig(LinphoneProxyConfig proxyCfg) {}
+		public void setDownloadBandwidth(int bw) {}
+		public void setDownloadPtime(int ptime) {}
+		public void setFirewallPolicy(FirewallPolicy pol) {}
+		public void setNetworkReachable(boolean isReachable) {}
+		public void setPlayLevel(int level) {}
+		public void setPlaybackGain(float gain) {}
+		public void setPreferredVideoSize(VideoSize vSize) {}
+		public void setPresenceInfo(int m, String a, OnlineStatus s) {}
+		public void setPreviewWindow(Object w) {}
+		public void setRing(String path) {}
+		public void setRootCA(String path) {}
+		public void setSignalingTransportPorts(Transports transports) {}
+		public void setStunServer(String stunServer) {}
+		public void setUploadBandwidth(int bw) {}
+		public void setUploadPtime(int ptime) {}
+		public void setVideoWindow(Object w) {}
+		public void setZrtpSecretsCache(String file) {}
+		public void startEchoCalibration(Object d)throws LinphoneCoreException {}
+		public void stopDtmf() {}
+		public void terminateCall(LinphoneCall call) {
+			changeStateInConf(call, false);
+			changeState(call, State.CallEnd);
+		}
+		public int updateCall(LinphoneCall call, LinphoneCallParams params) {return 0;}
+		private boolean partOfConf;
+		public void enterConference() {
+			pauseAllCalls();
+			partOfConf=true;
+			hackTriggerConfStateUpdate(); // FIXME hack; should have an event?
+		}
+		public void leaveConference() {
+			partOfConf=false;
+			hackTriggerConfStateUpdate(); // FIXME hack; should have an event?
+		}
+		public boolean isInConference() {return partOfConf;}
+		public int getConferenceSize() {
+			int count=0;
+			for (LinphoneCall c : calls) {
+				if (c.isInConference()) count++;
+			}
+			return count;
+		}
+		public void addAllToConference() {
+			for (LinphoneCall c : calls) {
+				int stateId = c.getState().value();
+				boolean connectionEstablished = stateId == State.ID_STREAMS_RUNNING || stateId == State.ID_PAUSED || stateId == State.ID_PAUSED_BY_REMOTE;
+				if (connectionEstablished) changeStateInConf(c, true);
+			}
+			enterConference();
+		}
+		public void addToConference(LinphoneCall call) {
+			if (getConferenceSize() == 0) {
+				addAllToConference();
+			} else {
+				boolean mergingActiveCall = call.equals(getCurrentCall());
+				changeStateInConf(call, true);
+				if (mergingActiveCall) enterConference();
+			}
+		}
+		public void terminateConference() {
+			leaveConference();
+			for (LinphoneCall call : calls) {
+				if (!call.isInConference()) continue;
+				terminateCall(call);
+			}
+		}
+		private void changeState(LinphoneCall call, State state) {
+			((LinphoneCallTest)call).state=state;
+			onCallStateChanged(call, state, "triggered by stub");
+		}
+		private void changeStateInConf(LinphoneCall call, boolean inConf) {
+			((LinphoneCallTest)call).inConf=inConf;
+			onCallStateChanged(call, call.getState(), "in conf state changed");
+		}
+		public int getCallsNb() {
+			int count=0;
+			for (LinphoneCall call : calls) {
+				if (!State.CallEnd.equals(call.getState())) count++;
+			}
+			return count;
+		}
+		public void terminateAllCalls() {
+			terminateConference();
+			for(LinphoneCall call : calls) {
+				if (!State.CallEnd.equals(call.getState())) terminateCall(call);
+			}
+		}
+		@SuppressWarnings("unchecked")
+		public List getCalls() {
+			return new ArrayList<LinphoneCall>(calls);
+		}
+		public void removeFromConference(LinphoneCall call) {
+			changeState(call, State.StreamsRunning);
+		}
+		
+	}
+
+
+	private static class LinphoneAddressTest implements LinphoneAddress {
+		private String displayName;
+		private String number;
+		public LinphoneAddressTest(String niceName, String number) {
+			this.displayName = niceName;
+			this.number = number;}
+		public String asString() {return displayName;}
+		public String asStringUriOnly() {return null;}
+		public String getDisplayName() {return displayName;}
+		public String getDomain() {return "example.org";}
+		public String getPort() {return "5060";}
+		public int getPortInt() {return 5060;}
+		public String getUserName() {return number;}
+		public void setDisplayName(String name) {}
+		public void setDomain(String domain) {}
+		public void setPort(String port) {}
+		public void setPortInt(int port) {}
+		public void setUserName(String username) {}
+		public void clean() {}
+		@Override public String toString() {return displayName;}
+	}
+
+
+
+	private static class LinphoneCallTest implements LinphoneCall {
+		private boolean inConf;
+		private State state;
+		private LinphoneAddress remoteAddress;
+		private int duration;
+
+		public LinphoneCallTest(int duration, String name, String number, State state) {
+			this.duration = duration;
+			this.state = state;
+			remoteAddress = new LinphoneAddressTest(name, number);
+		}
+
+		public boolean areStreamsEncrypted() {return false;}
+		public void enableCamera(boolean enabled) {}
+		public void enableEchoCancellation(boolean enable) {}
+		public void enableEchoLimiter(boolean enable) {}
+		public String getAuthenticationToken() {return null;}
+		public float getAverageQuality() {return 0;}
+		public LinphoneCallLog getCallLog() {return null;}
+		public LinphoneCallParams getCurrentParamsCopy() {return null;}
+		public float getCurrentQuality() {return 0;}
+		public CallDirection getDirection() {return null;}
+		public int getDuration() {return duration;}
+		public LinphoneAddress getRemoteAddress() {return remoteAddress;}
+		public LinphoneCall getReplacedCall() {return null;}
+		public State getState() {return state;}
+		public boolean isAuthenticationTokenVerified() {return false;}
+		public boolean isEchoCancellationEnabled() {return false;}
+		public boolean isEchoLimiterEnabled() {return false;}
+		public boolean isInConference() { return inConf;}
+	}
+
+
+	@Override
+	protected void registerLinphoneListener(boolean register) {
+		// Do nothing (especially, don't call LinphoneManager!)
+	}	
+}
+
+

From 84ed7ab7fd338f1c3f56c4b32b50cd43286f3453 Mon Sep 17 00:00:00 2001
From: Guillaume Beraudo <guillaume.beraudo@belledonne-communications.com>
Date: Wed, 14 Sep 2011 11:37:54 +0200
Subject: [PATCH 02/62] Fix mediastreamer2 build.

---
 src/org/linphone/ConferenceActivity.java    | 9 +++++++++
 src/org/linphone/LinphoneManager.java       | 5 +++++
 src/org/linphone/core/LinphoneCallImpl.java | 5 +++++
 3 files changed, 19 insertions(+)

diff --git a/src/org/linphone/ConferenceActivity.java b/src/org/linphone/ConferenceActivity.java
index 7178ed79d..ab7573dcb 100644
--- a/src/org/linphone/ConferenceActivity.java
+++ b/src/org/linphone/ConferenceActivity.java
@@ -23,9 +23,11 @@ import java.util.Comparator;
 import java.util.List;
 
 import org.linphone.LinphoneSimpleListener.LinphoneOnCallStateChangedListener;
+import org.linphone.core.Hacks;
 import org.linphone.core.LinphoneCall;
 import org.linphone.core.LinphoneCore;
 import org.linphone.core.LinphoneCoreException;
+import org.linphone.core.Log;
 import org.linphone.core.LinphoneCall.State;
 
 import android.app.AlertDialog;
@@ -49,6 +51,11 @@ public class ConferenceActivity extends ListActivity implements
 
 	// Start Override to test block
 	protected LinphoneCore lc() {
+		final int waitSlice=20;
+		while(!LinphoneManager.isInstanciated()) {
+			Log.d("LinphoneManager is not ready, waiting for ",waitSlice, "ms");
+			Hacks.sleep(waitSlice);
+		}
 		return LinphoneManager.getLc();
 	}
 
@@ -330,6 +337,8 @@ public class ConferenceActivity extends ListActivity implements
 			public void run() {
 				CalleeListAdapter adapter = (CalleeListAdapter) getListAdapter();
 
+				String stateStr = call + " " + state.toString();
+				Log.d("ConferenceActivity received state ",stateStr);
 				switch (state.value()) {
 				case State.ID_INCOMING_RECEIVED:
 				case State.ID_OUTGOING_RINGING:
diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java
index ac15fcd08..6bfe23710 100644
--- a/src/org/linphone/LinphoneManager.java
+++ b/src/org/linphone/LinphoneManager.java
@@ -1012,4 +1012,9 @@ public final class LinphoneManager implements LinphoneCoreListener {
 		}
 		
 	}
+
+
+	public static final boolean isInstanciated() {
+		return instance != null;
+	}
 }
diff --git a/src/org/linphone/core/LinphoneCallImpl.java b/src/org/linphone/core/LinphoneCallImpl.java
index acad5a09f..c96593d63 100644
--- a/src/org/linphone/core/LinphoneCallImpl.java
+++ b/src/org/linphone/core/LinphoneCallImpl.java
@@ -128,4 +128,9 @@ class LinphoneCallImpl implements LinphoneCall {
 		LinphoneCallParamsImpl params = new LinphoneCallParamsImpl(getCurrentParamsCopy(nativePtr));
 		return params.localConferenceMode();
 	}
+
+	@Override
+	public String toString() {
+		return "Call " + nativePtr;
+	}
 }

From 70a52abf300a87f0e8c73aa1dd7c5329b7990a92 Mon Sep 17 00:00:00 2001
From: Guillaume Beraudo <guillaume.beraudo@belledonne-communications.com>
Date: Tue, 20 Sep 2011 14:36:15 +0200
Subject: [PATCH 03/62] Initial support for conferencing.

---
 AndroidManifest.xml                           |   6 +-
 res/drawable/conf_callee_active_bg.xml        |  12 +
 res/drawable/conf_callee_bg.xml               |   7 +
 res/drawable/conf_callee_incoming_bg.xml      |  12 +
 res/drawable/conf_callee_inconf_bg.xml        |  12 +
 res/drawable/conf_callee_pressed_bg.xml       |  12 +
 res/drawable/conf_callee_selected_bg.xml      |   7 +
 res/drawable/conf_callee_selector_active.xml  |   7 +
 .../conf_callee_selector_incoming.xml         |   7 +
 res/drawable/conf_callee_selector_inconf.xml  |   7 +
 res/drawable/conf_callee_selector_normal.xml  |   7 +
 res/drawable/conf_merge_all.png               | Bin 0 -> 1054 bytes
 res/drawable/conf_remove.png                  | Bin 0 -> 886 bytes
 res/drawable/conf_status_inconf.png           | Bin 0 -> 840 bytes
 res/drawable/conf_status_paused.png           | Bin 0 -> 978 bytes
 res/drawable/conf_transfer.png                | Bin 0 -> 1235 bytes
 res/layout-land/dialer.xml                    |   9 +
 res/layout/conf_callee.xml                    |  40 +-
 res/layout/conf_choices_admin.xml             |  37 ++
 res/layout/conf_choices_dialog.xml            |  67 +++
 res/layout/conferencing.xml                   |  89 ++--
 res/layout/dialer.xml                         |  10 +
 res/values/callee_style.xml                   |  32 ++
 res/values/custom.xml                         |   1 +
 res/values/strings.xml                        |  31 ++
 res/xml/preferences.xml                       |   6 +-
 src/org/linphone/ConferenceActivity.java      | 428 ++++++++++++------
 src/org/linphone/DialerActivity.java          |  56 ++-
 src/org/linphone/LinphoneActivity.java        |  22 +-
 src/org/linphone/LinphoneManager.java         |   9 +-
 src/org/linphone/LinphoneService.java         |   1 -
 src/org/linphone/core/LinphoneCoreImpl.java   |  53 ++-
 test/org/linphone/TestConferenceActivity.java |  40 +-
 33 files changed, 791 insertions(+), 236 deletions(-)
 create mode 100644 res/drawable/conf_callee_active_bg.xml
 create mode 100644 res/drawable/conf_callee_bg.xml
 create mode 100644 res/drawable/conf_callee_incoming_bg.xml
 create mode 100644 res/drawable/conf_callee_inconf_bg.xml
 create mode 100644 res/drawable/conf_callee_pressed_bg.xml
 create mode 100644 res/drawable/conf_callee_selected_bg.xml
 create mode 100644 res/drawable/conf_callee_selector_active.xml
 create mode 100644 res/drawable/conf_callee_selector_incoming.xml
 create mode 100644 res/drawable/conf_callee_selector_inconf.xml
 create mode 100644 res/drawable/conf_callee_selector_normal.xml
 create mode 100644 res/drawable/conf_merge_all.png
 create mode 100644 res/drawable/conf_remove.png
 create mode 100644 res/drawable/conf_status_inconf.png
 create mode 100644 res/drawable/conf_status_paused.png
 create mode 100644 res/drawable/conf_transfer.png
 create mode 100644 res/layout/conf_choices_admin.xml
 create mode 100644 res/layout/conf_choices_dialog.xml
 create mode 100644 res/values/callee_style.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 7e38ea7ca..2ad149b55 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -110,9 +110,9 @@
 	
 	
 		<activity android:name="org.linphone.TestConferenceActivity"
-                  android:label="Test Linphone conference UI"
-                  android:theme="@android:style/Theme.NoTitleBar"
-                   android:enabled="true">
+                  android:label="Conf test"
+                  android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
+                  android:enabled="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
diff --git a/res/drawable/conf_callee_active_bg.xml b/res/drawable/conf_callee_active_bg.xml
new file mode 100644
index 000000000..662710e79
--- /dev/null
+++ b/res/drawable/conf_callee_active_bg.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?> 
+<shape xmlns:android="http://schemas.android.com/apk/res/android" 
+     android:shape="rectangle"> 
+    <padding android:left="7dp"
+        android:top="7dp"
+        android:right="7dp"
+        android:bottom="7dp" />
+
+    <solid android:color="@color/conf_active_bg_color"/> 
+    <corners android:radius="15dp" /> 
+</shape> 
+
diff --git a/res/drawable/conf_callee_bg.xml b/res/drawable/conf_callee_bg.xml
new file mode 100644
index 000000000..34c4f8687
--- /dev/null
+++ b/res/drawable/conf_callee_bg.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?> 
+<shape xmlns:android="http://schemas.android.com/apk/res/android" 
+     android:shape="rectangle"> 
+    <solid android:color="#777777"/> 
+    <corners android:radius="15dp"/> 
+</shape> 
+
diff --git a/res/drawable/conf_callee_incoming_bg.xml b/res/drawable/conf_callee_incoming_bg.xml
new file mode 100644
index 000000000..65ed06b42
--- /dev/null
+++ b/res/drawable/conf_callee_incoming_bg.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?> 
+<shape xmlns:android="http://schemas.android.com/apk/res/android" 
+     android:shape="rectangle"> 
+    <padding android:left="7dp"
+        android:top="7dp"
+        android:right="7dp"
+        android:bottom="7dp" />
+
+    <solid android:color="#336600"/> 
+    <corners android:radius="15dp" /> 
+</shape> 
+
diff --git a/res/drawable/conf_callee_inconf_bg.xml b/res/drawable/conf_callee_inconf_bg.xml
new file mode 100644
index 000000000..ada123c15
--- /dev/null
+++ b/res/drawable/conf_callee_inconf_bg.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?> 
+<shape xmlns:android="http://schemas.android.com/apk/res/android" 
+     android:shape="rectangle"> 
+    <padding android:left="7dp"
+        android:top="7dp"
+        android:right="7dp"
+        android:bottom="7dp" />
+
+    <solid android:color="#444444"/> 
+    <corners android:radius="15dp" /> 
+</shape> 
+
diff --git a/res/drawable/conf_callee_pressed_bg.xml b/res/drawable/conf_callee_pressed_bg.xml
new file mode 100644
index 000000000..31cfd4a6f
--- /dev/null
+++ b/res/drawable/conf_callee_pressed_bg.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?> 
+<shape xmlns:android="http://schemas.android.com/apk/res/android" 
+     android:shape="rectangle"> 
+    <solid android:color="#2E64FE"/> 
+    <corners android:radius="15dp"/>
+    <padding android:left="7dp"
+        android:top="7dp"
+        android:right="7dp"
+        android:bottom="7dp" />
+
+</shape> 
+
diff --git a/res/drawable/conf_callee_selected_bg.xml b/res/drawable/conf_callee_selected_bg.xml
new file mode 100644
index 000000000..d98b22f5a
--- /dev/null
+++ b/res/drawable/conf_callee_selected_bg.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?> 
+<shape xmlns:android="http://schemas.android.com/apk/res/android" 
+     android:shape="rectangle"> 
+    <solid android:color="#ff9200"/> 
+    <corners android:radius="15dp"/> 
+</shape> 
+
diff --git a/res/drawable/conf_callee_selector_active.xml b/res/drawable/conf_callee_selector_active.xml
new file mode 100644
index 000000000..cb64a4a1e
--- /dev/null
+++ b/res/drawable/conf_callee_selector_active.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:state_pressed="true" android:drawable="@drawable/conf_callee_pressed_bg" />
+	<item android:drawable="@drawable/conf_callee_active_bg" />
+</selector>
+
diff --git a/res/drawable/conf_callee_selector_incoming.xml b/res/drawable/conf_callee_selector_incoming.xml
new file mode 100644
index 000000000..b7e045d00
--- /dev/null
+++ b/res/drawable/conf_callee_selector_incoming.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:state_pressed="true" android:drawable="@drawable/conf_callee_pressed_bg" />
+	<item android:drawable="@drawable/conf_callee_incoming_bg" />
+</selector>
+
diff --git a/res/drawable/conf_callee_selector_inconf.xml b/res/drawable/conf_callee_selector_inconf.xml
new file mode 100644
index 000000000..85e3ea5ff
--- /dev/null
+++ b/res/drawable/conf_callee_selector_inconf.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:state_pressed="true" android:drawable="@drawable/conf_callee_pressed_bg" />
+	<item android:drawable="@drawable/conf_callee_inconf_bg" />
+</selector>
+
diff --git a/res/drawable/conf_callee_selector_normal.xml b/res/drawable/conf_callee_selector_normal.xml
new file mode 100644
index 000000000..2da1f36ac
--- /dev/null
+++ b/res/drawable/conf_callee_selector_normal.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:state_pressed="true" android:drawable="@drawable/conf_callee_pressed_bg" />
+	<item android:drawable="@drawable/conf_callee_bg" />
+</selector>
+
diff --git a/res/drawable/conf_merge_all.png b/res/drawable/conf_merge_all.png
new file mode 100644
index 0000000000000000000000000000000000000000..66626fe7113a42dcfe921c1b9c0507adf2f26346
GIT binary patch
literal 1054
zcmV+(1mXLMP)<h;3K|Lk000e1NJLTq000>P000*V1^@s6{^R5m00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01ejw01ejxLMWSf00007bV*G`2ipk_
z2{t6-EFC2P00W*$L_t(Y$F<g7h?G?r2k_sFv$N`smbqrRueH)Dx?>-pQ5Q>eQ4|DS
zgk}tM5lQqxky=sKPSa#Wq0kpmU?CENLU-L%SRqLSS&=%ciyN&ve)J)VuC4nu)5V-w
zcUK*~>A=f-c+WY{$N&GF|MT)cjqco>(Rt!>4)kO)7hP*B6h`NVRz*&yDk`y<;qtjX
zv3kb$eR99VH>pboF|=U2as`!h=8{9h=D&IDqM0ON--e}w$>elp<$76M3B_!5a@<12
zr~`;!z`+tMS-56rGM-Fb%E1aeo6eW+9k&=8574NSVrK-+Scb>Y9BXW<hf))6$1~WN
z&X<<e7Rtlp0gA!ims*q?V$%6i3QyoUti%`fh;J(tB0PZAIEoGUvY2h@i;a}Ezj5?j
zCgp}|dc|zihktN2)}UigwxwRxm3lIn_plM|cn9m#`NOHoq_|>kR@F&YZj6!m74RLl
zSLw5MasKc_ZH2;;@T5WpsR_>3;YF12aFweVmBuPu#aAOLRf~)BCB@FU(yt%tz*^jd
z7W{<)Y{oB`iIeyVv+-*vnoc~8AF#5Rje6sixP(eIn#TC#z*0pq8|_HvOHU%gbliZs
zcmyxwIHq84aQG?S3PCKzAm*dD94}L>VxGX%z)=DXA+jmOYy{K7vlMsY!H`imh61#A
z6?19mz*pFb_F^`YNaqj7(TG%Va1XA<w`fi0OU*coGl7EL=*KG<#%=hsn2oj>IVJGY
zghc^?u3AC=8zLXV$2fs^Clu2lMzAM9bSA(y69egd>Bp|lXjj;KD)6+s22**ASWd#{
zfrq~X46*QiYS`BwGM^L9jEu^~?{}ae@O5ge3O9s}r-SkJ!Eg<p*6^MeU^|PeFbfAl
z0D3Z+S{6|teSht`C;rH_4$aH;&IqLU2dIX^fxEFP7@ZR`xR7EFwiOEddor1yabrNB
zzv?7jm6bi&$fU{BBxf(ucul+LzICuX+?Cm(5O!eOm<-2`0c^s}_$)}w^WiE~rG9a~
zq<j6XV#y|wQw8DsAV85t7kUHH7aO-=L71OF={${x16v=j$^BCy<<-Z2+cK_0PJ9Aq
z%R>MM@hDn%<*vJM`@Md}M>V;RLYZvQf2N)ax8g(02%olK>%JG7`xfR7*6r~}@ID;x
z{`$y?*EZGbDN(p|u>kAlo=m2%?d`(({p50gAO_}tPo)w%Uq!4!d%n~W_U@SYV^JIb
Y0m*(T{33^_>;M1&07*qoM6N<$f+;Nh1poj5

literal 0
HcmV?d00001

diff --git a/res/drawable/conf_remove.png b/res/drawable/conf_remove.png
new file mode 100644
index 0000000000000000000000000000000000000000..7570cc5999f5cc25724431ddcc9698c109c640cc
GIT binary patch
literal 886
zcmV-+1Bv{JP)<h;3K|Lk000e1NJLTq000>P000*V1^@s6{^R5m00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01ejw01ejxLMWSf00007bV*G`2ipk_
z2{;eY6UplU00Q<&L_t(Y$F-KvOH@%5$3O2mzENkCl!9;u8&gXhR~0CsM6|Y6LA`<k
zH_;*rr3iF*4MY@Fe}NzbL-u18ZGsk3i^ytGjN^|fN~e;r3^mhce6PivH@}=2r$rAA
z@4mU`p6|Wi^F8Md{HJHqs85X@r7Vc*dcnEoP$)H?z2IfZZDA=22{Y}Z6bn8vbQs4|
z_okbO?;6Fl04p6%izjHgHdp*46F2vvX*HObo1P*Z@Mcd~qyPZaLIGO)UZHC4l4$Y=
zW7(5RHbE(n@St}?AjRn_InkLwW+Iy)1t4<SgITWFjvYWH&{QPmqP(3zjeNfWW`N~z
zz=N`G(suQ0dPO+kwR!CTCV`*8dJ&6@B>+>#Q6K<xCu4dD8{3j}jT@fK9sZDARRF&W
z*lGp~Hr-`F18^R=3+x32EN4<(mdMUZI!^;S&<^}6Le~~~Hv-GRZr}v)O-{G!55@=w
zyhH{YaM;nEYK2YRG%%f`n0jCy_)`G17dS2;K4Bs$0@Xyd&(LB-vsPu~sUElu90RmG
z04D)MM9>Bd0IySuv%s;j=#?~i$>$(&1lSKmqPjjNb>agK0q1~Pz$G~w&)r2z(C;tp
zr0Mzx{K45=pO?TFzyo-JvF1>y3m6nNx+Km5&~Kk2Z!xY`t`$nM52zCb)isAgJwP9@
zL%4SU?|@TLUB8nrfSO{)RIu(H&DVWDOVZbYYG4>RARtq~C~!8a>yPqoQ3188Oc+zj
zh|Vt->Q8Y=RHyJ?D+SvRoCcm}_Ofgc6}8d$hy|$5DpaS7*yDkGuBK4CN0hN3)jcKi
zT|ieZP&nYlZ_Fff(jJVVYHk$G1zJ@uz=~M8Bzab>SE~B~@DLagFpBp0Pa|gvCH_7T
zk!rSbY)xzh=&={QH5y9083E>A46(hl*C(IdqB6UGRZ7p&q#N7<mL@K4rS-;qX&~Px
zpRjOcc(aSEI^(CMsIHTn8|7dAK&-Vq1Iv<|&qA@FO?sT|n@?qb0rbB0{A;rYDgXcg
M07*qoM6N<$f<$6^%K!iX

literal 0
HcmV?d00001

diff --git a/res/drawable/conf_status_inconf.png b/res/drawable/conf_status_inconf.png
new file mode 100644
index 0000000000000000000000000000000000000000..3f89fb3fbfe984fa84ddac38303afb7dfd3eb2d7
GIT binary patch
literal 840
zcmV-O1GoH%P)<h;3K|Lk000e1NJLTq000>P000*V1^@s6{^R5m00001b5ch_0Itp)
z=>Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01ejw01ejxLMWSf00007bV*G`2ipk`
z3JV93S^d=j00PKKL_t(Y$F-JENEC4t$3Jh}cFim=bucG8Y=-|Jkf2krUhHItB7>bv
zCr@4?2qN5F4T_2`(N*X&5_RknftYj=DyeW*h20<&6w*unLDA-Q*xB9L-C5U!elRfe
zd++z&@B4lK2L97pNS!XchYoTe6OUJwof{u7yf5B1S#MNSggv*YBl{VjAG=CuqOs;B
zcF#}YDxgJk;oUvj9<A(;Wd7Mj!r>FRxHVBY3A0q76dV8;)eN-X`HT@RMG>{_WYo4N
z%W3KwT`D~+r34k6IKyUzBZ(aIJNN>mfT^f$Yq_r9k-HZ_(A>S2O2~fns+UwXor%ZE
z#N(*yFIC-D)t&%daS|=0?>CnsagRtax4A<-z%<Yiwe3D{dlm>~Eo&wq^CF!iOAT6Q
z;G|CFoTO7NKJuC>DHE9iwxE~+BGQ|+ED1_+5!n`zEfCO1ZqG@YprAna=n~HG8M+=U
zR-^4Ya8pDE4pLuE!o*Mm122RTqu#rU;v`H|wK@NI4w``t;KILDzH7LIau|fRRHh*4
z99et`Tn09QpQ?HsSO+42p{gHzcGiJ4fb>ZBt*(?)l5tML#HcKK0XPeM0<NS-TKh#L
zmbI*Y;2Q8WYgsW7iHS%I7zDloO`XZvcR^?*pHcNYVWN+J<hg(01#zf6uu<E73k+s0
zYq_jYC-X^B9+yJZY#-h6XUI^s=I9{`T2;Gf$O{R$g1)|i47@>AlRzwMS-t-D;h{_d
zvGN;dU^!~rNmVVC2^bA^9vG=3v-%rVt=c~PGF8<wx`Jimb*|Zj$=t(^Li_L;Ewqor
z$|~B27FVCQH|c#JO6H`@z>3~f)jxS<fR%5rDrEUanNNzKbKg^~2b+ulE7N0aJfEmJ
zdP@f0-IKIGS*<;^0M-`XS9P%8|A5~?O(f+tveWhvRK3Zkh(f0~tn#`+=>7tG_rDMO
SC8SLN0000<MNUMnLSTaSpmF5@

literal 0
HcmV?d00001

diff --git a/res/drawable/conf_status_paused.png b/res/drawable/conf_status_paused.png
new file mode 100644
index 0000000000000000000000000000000000000000..2d6a3cb4dae73c58889ea50f4def14040788fc25
GIT binary patch
literal 978
zcmV;@11<cCP)<h;3K|Lk000e1NJLTq000>P000*V1^@s6{^R5m00001b5ch_0Itp)
z=>Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01ejw01ejxLMWSf00007bV*G`2ipk`
z3JM`wPf2M200UA<L_t(Y$F-HsZyQAz#(y(w?<TGj3zWuA;(&^6NLT?UuK5#sKmsA>
zAE@{^a4LwVTEYQ=IC0}p2?=c^xFfh!K;Xc=a^gyM1x*YM1X_~N`g4ba-`(uiHt7XR
zE6?oAKF|BSpYT8ZZhDK+I`t?YG^*8!XXUM}XubDVk>jkvC`CUwy`%mMyngK>sq5J@
zjp#l7J%IttDV*KwQ~BV|cqIm?T`iKz6|n7DF8H5ofadyoFo`4x)CfpOFruV><w*v5
z06==KMCHxzG>`+*z+p&K^8FOB2>jYyU+)8S%G<;p<ZkXoI~^`+8^wqKD~+-<2>4~-
zCEyJqSOi`JUI#uE!lbf(@|6bIeP=15NjX_6m%au#2iyW)0gg+)KM(u~+ygEGEnp;Q
zI@M+8-GwAckd86v9M8UeBYr*y%mVWg!<_8<z+=GlFb*c+E@NqG-uWTOj<=K`aJ?F}
ztIHT;6fgrUh_!QoB{w_bN-KQlzTX0!B*HjDSR-j?U`VjBEW1dF1q8qmFaWwhTaqRR
zC?`J*y6d%)xny8>;|X+#=jbUhAZ`tP0Yv_d5IvCR00@p|pn3VJA<^bu0wT}>I<&gt
zHO7^I0;a_JtSHL>MZgv#1^{iROU-kK0xXkIqeqK=qzPo?<-BBD2lz+82Z@`5qnO(m
zt&_N1cXK~vo0XW@l3Bk4j;QL&_u6T!g*i30BSa+a>CU(g(-W&_h3G_L5h^(mGMvU5
zc5`iPGmQdIpfF#){P6j)03J&L7J&OeSxBvM{VzeJKxZtuqbwSSN2g~>8L|2h_)Ut=
z5;rPQ`Zv&1%RfzS(MqE)ct2wR?PSo-IrhK062FoK9tXaWI=KVn#YNvrolKQJyhV9y
zE1E6wX6bsjPgCjU$1jr3uV5EevGXfTpMQ>-g$l+PN5KA4O7$DnDka~yfmI=EDy6yr
zH@qS`NJiZC_LKSg%NLhO3yED=CAfc=_8+?xUU+rH*CpS#WX?os99J;Vn&-XS<BOv8
z<29z1p25zq(mSZrJ*ac?$@NE`?VZXt)`K=HA03`OeoyZ0(>d7T?t7n21}twA*2tu}
zf98yTIOjW+ABHVm4U<b52#mq4w`iuTV+jEM1;r>LF_up(x&QzG07*qoM6N<$g5Kq@
A+W-In

literal 0
HcmV?d00001

diff --git a/res/drawable/conf_transfer.png b/res/drawable/conf_transfer.png
new file mode 100644
index 0000000000000000000000000000000000000000..d539cd241cc20029cc08ab78864b4cd58bcffef9
GIT binary patch
literal 1235
zcmV;^1T6cBP)<h;3K|Lk000e1NJLTq000>P000*V1^@s6{^R5m00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01ejw01ejxLMWSf00007bV*G`2ipk_
z6A=@T<t*s{00dJ>L_t(Y$F-GBY*bYg$A9O}o6bxfpaMoJ@-b~=3Zw<6ErjWaO*BSa
z7#4<LSm{Dz)EGnJ!i`@GV+<QKF%lOhCTfrn6XQlD2Izpboq^JU5?eYY5;XEn+j-N@
zyn9^Co9VO#G%?=IyLtEA^Z%c7{^wlypH|PnqUzrHFOGueR7z3M2Sow49*00Mj3UfX
z`gb6aLxYW`I5YF*w!y0{;dUD9RxwgI&7R+PV2Xy;$xhwhnkLy70%K4>{ks7ZsQQrw
zo)zj3W}Z~*y#+J?S&aDvr|wwCnk_~3bk^2@1VN`4xZrq~TWdDEw)KUnJ223s*4qPg
zA*L0025X;kvm;&=phC^Ur4jcwIhf163evOxfVmni5D<A0F^>ZQ)Pfj*CEeS1+v;7N
z_0zaIvH-&KZUeHpZxMY<VxiIDlP#!yX-?#7Zz}Q?x-hLGWwhEORmBNd5}EK^kf15y
z;>{SZv>m7it{~<OW6XCV@-<%RRBa|i${SmRR9Bvpx!x6-T(1KlB7h*)@Wi06uI_XM
zEOa;Zc$u+d9Y6p`+4|^bPQ%i@?V&Z68m@t;CA6%LAMcx}jVlZkGr8X5z%CWJ*s-=-
zCubsni@}zyvKRUzB67VPv%S%I|EBBhq19GG!3uRyINCZr2cYL?0B!+CfCMlks;^Ya
zzqP-9w(!N0E2`S!mvtm_cz*yu3q??^YG%_HvxV;N57T!!?Eu%}v1AW03@icO$&4L!
z%Joo8MJ4%NoAbcpazf37tlH>TZ8lXZ5Zoy9rMeQR&*XYn10Mjt0rw)NzhdE_HL4bK
z47J-(yXE1Bw(OfDSHGRb4G=kyz6NL}M;Ms#PaWUV1B$?=Os=;r9!n0HiXU_MieStM
zA8va=TvXxI^1P%^e_!PhG$nu=zM}%*0(C&i--rD#z;ysg^hc^hPmQP6tM!fm%YnU!
zX;#$`#=O_Dw)@1~EGe0>)ciht1o#|i0<!T~vJJp7Qm(5{^&(<^LhUYK59&9$^-2g&
zqmaq<-f5mb2E6S9Tn5?zM8P-{E(jO`JiG4YTfnD&eJUdb#5{5O(!f1;8Q4qx2$H}Q
z@P0LD>y?Qn`Xek3G|(L0Ky##xH-Fvzv4}j6+KOHaSR0SGJUWa>ZEu#xn<$y_)G#mr
z`~Vz^$C6W(Y3$%{b_}j0VxrWWD9*Bm*S%{uF9UHAF~CuEoU73Whsm2>&3pmlDCzSl
zfOQq%cq~~aPz?GV@2_t+j#6);yw<nF$hv0F{o~BLz;ogRU&!z5{IDaI_-lC!6wj1}
zBXvTmGf(>b!WyZR$L5K|t=m6Z2QPg@Q>dN9@P^<o>(3U?7qX1HLyWjXj1|tp+C0<a
zWlt4V&KE=cfeunh?(#DF>(9vx<fhLsnjd1ckY&`(GCqCoA6|V+s%v_|-#fnXE23)v
x*f;VjuARWusd=q$KrLbeG+vnEo1J%t{u^@0vBoHdyR!fQ002ovPDHLkV1gD2MhXA`

literal 0
HcmV?d00001

diff --git a/res/layout-land/dialer.xml b/res/layout-land/dialer.xml
index da2a314e5..2ec2197f3 100644
--- a/res/layout-land/dialer.xml
+++ b/res/layout-land/dialer.xml
@@ -51,6 +51,15 @@
 			<org.linphone.ui.HangCallButton android:id="@+id/HangUp" android:layout_height="fill_parent" android:layout_width="fill_parent" android:layout_weight="1" android:src="@drawable/stopcall_red" android:background="@drawable/clavier_bg"/>
 		</LinearLayout>
 
+		<LinearLayout android:id="@+id/AddCallControlRow" android:layout_height="wrap_content" android:layout_width="fill_parent" android:gravity="bottom" android:visibility="gone">
+			<Button android:id="@+id/AddCallButton" android:text="@string/AddCallButtonText" android:layout_height="fill_parent" android:layout_width="fill_parent" android:layout_weight="1" android:background="@drawable/clavier_bg"/>
+			<Button android:id="@+id/AddCallCancelButton" android:text="@string/CancelButtonText" android:layout_height="fill_parent" android:layout_width="fill_parent" android:layout_weight="1" android:background="@drawable/clavier_bg"/>
+		</LinearLayout>
+
+		<LinearLayout android:id="@+id/transferCallControlRow" android:layout_height="wrap_content" android:layout_width="fill_parent" android:gravity="bottom" android:visibility="gone">
+			<Button android:id="@+id/TransferCallButton" android:text="@string/TransferCallButtonText" android:layout_height="fill_parent" android:layout_width="fill_parent" android:layout_weight="1" android:background="@drawable/clavier_bg"/>
+			<Button android:id="@+id/TransferCallCancelButton" android:text="@string/CancelButtonText" android:layout_height="fill_parent" android:layout_width="fill_parent" android:layout_weight="1" android:background="@drawable/clavier_bg"/>
+		</LinearLayout>
 
 
 		<EditText android:id="@+id/status_label" android:layout_width="fill_parent" 
diff --git a/res/layout/conf_callee.xml b/res/layout/conf_callee.xml
index 03d99b0f7..eb117bc4b 100644
--- a/res/layout/conf_callee.xml
+++ b/res/layout/conf_callee.xml
@@ -1,16 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-  xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+  android:minHeight="60sp"
   android:layout_width="fill_parent" android:layout_height="fill_parent" >
-    <ImageView android:id="@+id/picture" android:layout_width="wrap_content" android:src="@drawable/unknown_person" android:layout_height="wrap_content"
-     android:layout_alignParentLeft="true"/>
+  
+    <ImageView android:id="@+id/picture" android:layout_width="wrap_content"
+     android:src="@drawable/unknown_person" android:layout_height="wrap_content"
+     android:layout_alignParentLeft="true" android:layout_centerVertical="true"
+     android:paddingRight="3sp"/>
     
     <LinearLayout android:id="@+id/callee_buttons" android:layout_alignParentRight="true" 
-    android:layout_width="wrap_content" android:layout_height="wrap_content">
+    android:layout_width="wrap_content" android:layout_height="fill_parent"
+    android:layout_centerVertical="true">
       <ImageButton android:id="@+id/addVideo" android:src="@drawable/conf_video"
         android:layout_width="wrap_content" android:layout_height="wrap_content" />
       <ImageButton android:id="@+id/merge_to_conference" android:src="@drawable/conf_merge"
         android:layout_width="wrap_content" android:layout_height="wrap_content" />
+      <ImageButton android:id="@+id/remove_from_conference" android:src="@drawable/conf_remove"
+        android:layout_width="wrap_content" android:layout_height="wrap_content" />
       <ImageButton android:id="@+id/unhook_call" android:src="@drawable/conf_unhook"
         android:layout_width="wrap_content" android:layout_height="wrap_content" />
       <ImageButton android:id="@+id/terminate_call" android:src="@drawable/conf_terminate"
@@ -20,10 +26,24 @@
       <ImageButton android:id="@+id/resume" android:src="@drawable/conf_resume"
         android:layout_width="wrap_content" android:layout_height="wrap_content"/>
     </LinearLayout>
-    
-    <LinearLayout android:layout_width="fill_parent" android:layout_height="fill_parent" android:orientation="vertical"
-    	android:layout_toLeftOf="@id/callee_buttons" android:layout_toRightOf="@id/picture">
-      <TextView android:id="@+id/name" android:layout_width="fill_parent" android:layout_height="wrap_content" />
-      <TextView android:id="@+id/address" android:layout_width="fill_parent" android:layout_height="wrap_content"/>
+
+	<LinearLayout android:id="@+id/callee_statuses" android:layout_toLeftOf="@id/callee_buttons"
+	  android:layout_width="wrap_content" android:layout_height="fill_parent"
+	  android:layout_centerVertical="true">
+	  	<TextView android:id="@+id/status_label" style="@style/callee_status"/>
+	  	<ImageView android:id="@+id/callee_status_paused" style="@style/callee_status" android:src="@drawable/conf_status_paused" />
+		<ImageView android:id="@+id/callee_status_inconf" style="@style/callee_status" android:src="@drawable/conf_status_inconf"/>
+	</LinearLayout>
+
+
+    <LinearLayout android:id="@+id/callee_block" 
+    	android:layout_toRightOf="@id/picture" android:layout_toLeftOf="@id/callee_statuses"
+    	android:layout_width="fill_parent" android:layout_height="fill_parent"
+    	android:layout_centerVertical="true" android:orientation="vertical">
+      <TextView android:id="@+id/name" style="@style/callee_name" />
+      <TextView android:id="@+id/address" style="@style/callee_address" android:singleLine="true"
+		android:ellipsize="marquee"/>
     </LinearLayout>
+
+
 </RelativeLayout>
diff --git a/res/layout/conf_choices_admin.xml b/res/layout/conf_choices_admin.xml
new file mode 100644
index 000000000..cc7963fb3
--- /dev/null
+++ b/res/layout/conf_choices_admin.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="fill_parent" android:layout_height="fill_parent"
+	android:orientation="vertical">
+
+	<LinearLayout android:id="@+id/conf_add_all_to_conference_button"
+	android:layout_width="fill_parent" android:layout_height="wrap_content">
+	<ImageButton android:src="@drawable/conf_merge_all"
+		android:layout_width="wrap_content" android:layout_height="wrap_content" />
+	<TextView android:text="@string/conf_choice_merge_all_to_conference" android:layout_gravity="center_vertical"
+		android:layout_width="wrap_content" android:layout_height="wrap_content" />
+	</LinearLayout>
+
+	<LinearLayout android:id="@+id/conf_enter_button"
+	android:layout_width="fill_parent" android:layout_height="wrap_content">
+	<ImageButton android:src="@drawable/conf_resume"
+		android:layout_width="wrap_content" android:layout_height="wrap_content" />
+	<TextView android:text="@string/conf_admin_choice_enter" android:layout_gravity="center_vertical"
+		android:layout_width="wrap_content" android:layout_height="wrap_content" />
+	</LinearLayout>
+
+	<LinearLayout android:id="@+id/conf_leave_button"
+	android:layout_width="fill_parent" android:layout_height="wrap_content">
+	<ImageButton android:src="@drawable/conf_pause"
+		android:layout_width="wrap_content" android:layout_height="wrap_content" />
+	<TextView android:text="@string/conf_admin_choice_leave" android:layout_gravity="center_vertical"
+		android:layout_width="wrap_content" android:layout_height="wrap_content" />
+	</LinearLayout>
+
+	<LinearLayout android:id="@+id/conf_terminate_button"
+	android:layout_width="fill_parent" android:layout_height="wrap_content">
+	<ImageButton android:src="@drawable/conf_terminate"
+		android:layout_width="wrap_content" android:layout_height="wrap_content" />
+	<TextView android:text="@string/conf_admin_choice_terminate" android:layout_gravity="center_vertical"
+		android:layout_width="wrap_content" android:layout_height="wrap_content" />
+	</LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/conf_choices_dialog.xml b/res/layout/conf_choices_dialog.xml
new file mode 100644
index 000000000..b79550925
--- /dev/null
+++ b/res/layout/conf_choices_dialog.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+		android:layout_width="fill_parent" 
+		android:layout_height="fill_parent">
+
+<LinearLayout 
+	android:layout_width="fill_parent" android:layout_height="fill_parent"
+	android:orientation="vertical">
+
+	<LinearLayout android:id="@+id/transfer_new"
+	android:layout_width="fill_parent" android:layout_height="wrap_content">
+	<ImageButton android:src="@drawable/conf_transfer"
+		android:layout_width="wrap_content" android:layout_height="wrap_content" />
+	<TextView android:text="@string/conf_choice_transfer_new" android:layout_gravity="center_vertical"
+		android:layout_width="wrap_content" android:layout_height="wrap_content" />
+	</LinearLayout>
+
+	<LinearLayout android:id="@+id/transfer_existing"
+	android:layout_width="fill_parent" android:layout_height="wrap_content">
+	<ImageButton android:src="@drawable/conf_transfer"
+		android:layout_width="wrap_content" android:layout_height="wrap_content" />
+	<TextView android:text="@string/conf_choice_transfer_existing" android:layout_gravity="center_vertical"
+		android:layout_width="wrap_content" android:layout_height="wrap_content" />
+	</LinearLayout>
+
+	<LinearLayout android:id="@+id/remove_from_conference"
+	android:layout_width="fill_parent" android:layout_height="wrap_content">
+	<ImageButton android:src="@drawable/conf_remove"
+		android:layout_width="wrap_content" android:layout_height="wrap_content" />
+	<TextView android:text="@string/conf_choice_remove_from_conference" android:layout_gravity="center_vertical"
+		android:layout_width="wrap_content" android:layout_height="wrap_content" />
+	</LinearLayout>
+
+
+	<LinearLayout android:id="@+id/merge_to_conference"
+	android:layout_width="fill_parent" android:layout_height="wrap_content">
+	<ImageButton android:src="@drawable/conf_merge"
+		android:layout_width="wrap_content"	android:layout_height="wrap_content" />
+	<TextView android:text="@string/conf_choice_merge_to_conference" android:layout_gravity="center_vertical"
+		android:layout_width="wrap_content" android:layout_height="wrap_content" />
+	</LinearLayout>
+
+	<LinearLayout android:id="@+id/pause"
+	android:layout_width="fill_parent" android:layout_height="wrap_content">
+	<ImageButton android:src="@drawable/conf_pause"
+		android:layout_width="wrap_content" android:layout_height="wrap_content" />
+	<TextView android:text="@string/conf_choice_pause" android:layout_gravity="center_vertical"
+		android:layout_width="wrap_content" android:layout_height="wrap_content" />
+	</LinearLayout>
+
+	<LinearLayout android:id="@+id/resume"
+	android:layout_width="fill_parent" android:layout_height="wrap_content">
+	<ImageButton android:src="@drawable/conf_resume"
+		android:layout_width="wrap_content" android:layout_height="wrap_content" />
+	<TextView android:text="@string/conf_choice_resume" android:layout_gravity="center_vertical"
+		android:layout_width="wrap_content" android:layout_height="wrap_content" />
+	</LinearLayout>
+
+	<LinearLayout android:id="@+id/terminate_call"
+	android:layout_width="fill_parent" android:layout_height="wrap_content">
+	<ImageButton android:src="@drawable/conf_terminate"
+		android:layout_width="wrap_content" android:layout_height="wrap_content" />
+	<TextView android:text="@string/conf_choice_terminate" android:layout_gravity="center_vertical"
+		android:layout_width="wrap_content" android:layout_height="wrap_content" />
+	</LinearLayout>
+</LinearLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/res/layout/conferencing.xml b/res/layout/conferencing.xml
index 5a78dfc63..61791955b 100644
--- a/res/layout/conferencing.xml
+++ b/res/layout/conferencing.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
- <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
          android:orientation="vertical"
          android:layout_width="fill_parent"
          android:layout_height="fill_parent"
@@ -7,47 +7,24 @@
          android:paddingRight="8dp">
 
 
-<RelativeLayout android:id="@+id/conf_header"
-  android:layout_width="fill_parent" android:layout_height="wrap_content" >
-    <LinearLayout android:id="@+id/conf_management_buttons" android:layout_alignParentRight="true" 
-       android:layout_width="wrap_content" android:layout_height="wrap_content">
-      <Button android:id="@+id/conf_enter_or_leave_button" android:layout_alignParentRight="true" 
-        android:layout_width="wrap_content" android:layout_height="wrap_content"/>
-      <ImageButton android:id="@+id/terminate_conference" android:src="@drawable/conf_terminate"
-        android:layout_width="wrap_content" android:layout_height="wrap_content" />
-    </LinearLayout>
-    
-    <LinearLayout android:layout_width="fill_parent" android:layout_height="wrap_content" android:orientation="vertical"
-    	android:layout_toLeftOf="@id/conf_management_buttons" android:layout_alignParentLeft="true">
-      <TextView android:text="@string/conf_text_you_host_a_conference"
-        android:layout_width="fill_parent" android:layout_height="wrap_content" />
-      <TextView android:id="@+id/conf_self_attending"
-        android:layout_width="fill_parent" android:layout_height="wrap_content"/>
-    </LinearLayout>
-</RelativeLayout>
-
-
-     <ListView android:id="@android:id/list"
-               android:layout_width="fill_parent"
-               android:layout_height="wrap_content"
-               android:layout_weight="1"
-               android:drawSelectorOnTop="false"/>
-
-	<LinearLayout android:orientation="horizontal" android:layout_width="fill_parent" android:layout_height="wrap_content"> 
-	<ToggleButton android:textOn="Mute" android:textOff="Mute" android:id="@+id/toggleMuteMic"
-	  android:width="0px" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_weight="1" />
-	<ToggleButton android:textOn="Speaker" android:textOff="Speaker" android:id="@+id/toggleSpeaker" 
-	  android:width="0px" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_weight="1" />
-	<ToggleButton android:textOn="Bluetooth" android:textOff="Bluetooth" android:id="@+id/toggleBluetooth" 
-	  android:width="0px" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_weight="1" />
+	<LinearLayout android:id="@+id/conf_header" android:layout_alignParentTop="true"
+			android:orientation="vertical" android:layout_marginBottom="10dip"
+			android:layout_width="fill_parent" android:layout_height="wrap_content" >
+      	<TextView android:text="@string/conf_text_you_host_a_conference"
+        	android:layout_width="fill_parent" android:layout_height="wrap_content" 
+        	android:gravity="center"/>
+<!--      	<TextView android:id="@+id/conf_self_attending"-->
+<!--        	android:layout_width="fill_parent" android:layout_height="wrap_content"/>-->
 	</LinearLayout>
 
-<!--android:width="0px" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_weight="1-->
 
-	<LinearLayout android:layout_width="fill_parent" android:layout_height="wrap_content">
-		<Button android:text="+ Add call" android:id="@+id/addCall"
-	     android:layout_width="wrap_content" android:layout_height="wrap_content"
-	     />
+
+
+
+	<LinearLayout android:id="@+id/conf_bottom_row" android:layout_alignParentBottom="true"
+		android:layout_width="fill_parent" android:layout_height="wrap_content">
+		<Button android:text="@string/AddCallButtonText" android:id="@+id/addCall"
+	     android:layout_width="wrap_content" android:layout_height="wrap_content" />
 
 		<org.linphone.ui.HangCallButton android:id="@+id/incallHang" android:layout_width="wrap_content" android:layout_height="wrap_content"
 		 android:src="@drawable/mini_stopcall_red"  android:layout_weight="1" />
@@ -57,4 +34,36 @@
 	</LinearLayout>
 
 
- </LinearLayout>
+	<LinearLayout android:id="@+id/conf_menu_row" 
+			android:layout_above="@id/conf_bottom_row"
+			android:layout_width="fill_parent" android:layout_height="wrap_content"> 
+	<ToggleButton android:id="@+id/toggleMuteMic" style="@style/conf_toggle_button" 
+		android:textOn="@string/mutemic_button_txt" android:textOff="@string/mutemic_button_txt" />
+	<ToggleButton android:id="@+id/toggleSpeaker" style="@style/conf_toggle_button"
+		android:textOn="@string/speaker_button_txt" android:textOff="@string/speaker_button_txt" />
+	<ToggleButton android:id="@+id/toggleBluetooth" style="@style/conf_toggle_button"  
+		android:textOn="@string/bluetooth_button_txt" android:textOff="@string/bluetooth_button_txt" 
+		android:visibility="gone"/>
+	</LinearLayout>
+
+	<LinearLayout android:id="@+id/conf_simple_actions" android:visibility="visible" 
+		android:layout_width="fill_parent" android:layout_height="wrap_content"
+		android:layout_above="@id/conf_menu_row"
+		android:layout_centerInParent="true">
+		<Button android:id="@+id/conf_simple_merge" android:text="@string/conf_simple_merge" android:visibility="gone"
+			android:layout_width="wrap_content" android:layout_height="wrap_content" />
+	</LinearLayout>
+
+
+     <ListView android:id="@android:id/list"
+               android:layout_width="fill_parent"
+               android:layout_height="wrap_content"
+               android:drawSelectorOnTop="true"
+               android:dividerHeight="10dip"
+               android:divider="@android:color/transparent"
+               android:layout_below="@id/conf_header"
+               android:layout_above="@id/conf_simple_actions"
+               android:layout_alignWithParentIfMissing="true"
+               android:fadeScrollbars="false"
+     />
+ </RelativeLayout>
diff --git a/res/layout/dialer.xml b/res/layout/dialer.xml
index a5b8ed433..9a8c74b03 100644
--- a/res/layout/dialer.xml
+++ b/res/layout/dialer.xml
@@ -48,6 +48,16 @@
 			<org.linphone.ui.HangCallButton android:id="@+id/HangUp" android:src="@drawable/stopcall_red" android:layout_height="fill_parent" android:layout_width="fill_parent" android:layout_weight="0.25" android:background="@drawable/clavier_bg"/>
 		</LinearLayout>
 
+		<LinearLayout android:id="@+id/AddCallControlRow" android:layout_height="wrap_content" android:layout_width="fill_parent" android:gravity="bottom" android:visibility="gone">
+			<Button android:id="@+id/AddCallButton" android:text="@string/AddCallButtonText" android:layout_height="fill_parent" android:layout_width="fill_parent" android:layout_weight="1" android:background="@drawable/clavier_bg"/>
+			<Button android:id="@+id/AddCallCancelButton" android:text="@string/CancelButtonText" android:layout_height="fill_parent" android:layout_width="fill_parent" android:layout_weight="1" android:background="@drawable/clavier_bg"/>
+		</LinearLayout>
+
+		<LinearLayout android:id="@+id/transferCallControlRow" android:layout_height="wrap_content" android:layout_width="fill_parent" android:gravity="bottom" android:visibility="gone">
+			<Button android:id="@+id/TransferCallButton" android:text="@string/TransferCallButtonText" android:layout_height="fill_parent" android:layout_width="fill_parent" android:layout_weight="1" android:background="@drawable/clavier_bg"/>
+			<Button android:id="@+id/TransferCallCancelButton" android:text="@string/CancelButtonText" android:layout_height="fill_parent" android:layout_width="fill_parent" android:layout_weight="1" android:background="@drawable/clavier_bg"/>
+		</LinearLayout>
+
 		<EditText android:id="@+id/status_label" android:clickable="false" android:focusable="false" android:cursorVisible="false" android:textSize="12sp" android:height="15sp" android:layout_height="wrap_content" android:layout_width="fill_parent" android:background="@android:color/transparent" android:textColor="@android:color/white" />
 	</LinearLayout>
 
diff --git a/res/values/callee_style.xml b/res/values/callee_style.xml
new file mode 100644
index 000000000..6231cfc25
--- /dev/null
+++ b/res/values/callee_style.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="callee_name" parent="@android:style/TextAppearance.Medium">
+        <item name="android:layout_width">fill_parent</item>
+        <item name="android:layout_height">fill_parent</item>
+        <item name="android:layout_weight">1</item>
+    </style>
+
+    <style name="callee_address" parent="@android:style/TextAppearance">
+        <item name="android:layout_width">fill_parent</item>
+        <item name="android:layout_height">fill_parent</item>
+        <item name="android:layout_weight">1</item>
+    </style>
+
+	<style name="callee_status">
+		<item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:gravity">center_vertical</item>
+        <item name="android:layout_gravity">center_vertical</item>
+        <item name="android:scaleType">center</item>
+	</style>
+
+	<style name="conf_toggle_button" parent="@android:style/Widget.Button.Toggle">
+		<item name="android:width">0px</item>
+		<item name="android:layout_width">fill_parent</item>
+		<item name="android:layout_height">wrap_content</item>
+		<item name="android:layout_weight">1</item>
+<!--		<item name="android:layout_width">wrap_content</item>-->
+<!--        <item name="android:layout_height">wrap_content</item>-->
+	</style> 
+
+</resources>
\ No newline at end of file
diff --git a/res/values/custom.xml b/res/values/custom.xml
index abc5529e9..3489ab466 100644
--- a/res/values/custom.xml
+++ b/res/values/custom.xml
@@ -18,6 +18,7 @@
 	<bool name="allow_edit_in_dialer">true</bool>
 	<string name="notification_registered">Registered to %s </string> 
 	<string name="notification_register_failure">Fails to register to %s</string>
+	<color name="conf_active_bg_color">#191970</color>
 
 	<string name="about_text">Linphone %s SIP (rfc 3261) compatible phone under GNU Public License V2\n http://www.linphone.org\n\nInstructions\nhttp://www.linphone.org/m/help\n\n© 2011 Belledonne Communications</string>
 	<string name="about_bugreport_email">linphone-android@belledonne-communications.com</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 4de957040..142bbf769 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1,6 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
+	<string name="status_conf_call">conf</string>
+	<string name="status_active_call">active</string>
+	<string name="state_paused">paused</string>
+	<string name="state_paused_by_remote">paused</string>
+	<string name="state_streams_running"></string>
+	<string name="state_incoming_received">incoming</string>
+	<string name="state_outgoing_ringing">ringing</string>
+	
+	<string name="mutemic_button_txt">Mute</string>
+	<string name="speaker_button_txt">Speaker</string>
+	<string name="bluetooth_button_txt">Bluetooth</string>
+
+	<string name="CancelButtonText">Cancel</string>
+	<string name="AddCallButtonText">Add call</string>
+	<string name="TransferCallButtonText">Transfer call</string>
+
+	<string name="conf_admin_choice_enter">Enter conference</string>
+	<string name="conf_admin_choice_leave">Momentarily leave conference</string>
+	<string name="conf_admin_choice_terminate">Terminate conference</string>
+
+	<string name="conf_choice_transfer_existing">Transfer to existing call</string>
+	<string name="conf_choice_transfer_new">Transfer to new call</string>
+	<string name="conf_choice_resume">Resume</string>
+	<string name="conf_choice_pause">Pause</string>
+	<string name="conf_choice_merge_to_conference">Add to conference</string>
+	<string name="conf_choice_merge_all_to_conference">Add all calls to conference</string>
+	<string name="conf_choice_remove_from_conference">Remove from the conference</string>
+	<string name="conf_choice_terminate">Terminate</string>
+
+	<string name="conf_simple_merge">Merge calls</string>
+	
 	<string name="show_send_dtmfs_button">DTMFs</string>
 
 	<string name="conf_text_you_host_a_conference">You host a conference</string>
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index f17a6bb6f..b6f689f0c 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -4,16 +4,16 @@
 
 	<PreferenceCategory android:title="@string/pref_sipaccount">
 		<EditTextPreference android:title="@string/pref_username"
-			android:key="@string/pref_username_key"></EditTextPreference>
+			android:key="@string/pref_username_key" android:inputType="text|textEmailAddress"></EditTextPreference>
 
 		<EditTextPreference android:title="@string/pref_passwd"
 			android:key="@string/pref_passwd_key" android:password="true"></EditTextPreference>
 
 		<EditTextPreference android:title="@string/pref_domain"
-			android:key="@string/pref_domain_key"></EditTextPreference>
+			android:key="@string/pref_domain_key" android:inputType="text|textEmailAddress"></EditTextPreference>
 
 		<EditTextPreference android:title="@string/pref_proxy"
-			android:key="@string/pref_proxy_key"></EditTextPreference>
+			android:key="@string/pref_proxy_key" android:inputType="text|textEmailAddress"></EditTextPreference>
 
 		<CheckBoxPreference android:enabled="true"
 			android:selectable="true" android:key="@string/pref_enable_outbound_proxy_key"
diff --git a/src/org/linphone/ConferenceActivity.java b/src/org/linphone/ConferenceActivity.java
index ab7573dcb..71e66add2 100644
--- a/src/org/linphone/ConferenceActivity.java
+++ b/src/org/linphone/ConferenceActivity.java
@@ -18,36 +18,50 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 package org.linphone;
 
+import static android.view.View.GONE;
+import static android.view.View.VISIBLE;
+
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 
 import org.linphone.LinphoneSimpleListener.LinphoneOnCallStateChangedListener;
-import org.linphone.core.Hacks;
 import org.linphone.core.LinphoneCall;
 import org.linphone.core.LinphoneCore;
 import org.linphone.core.LinphoneCoreException;
 import org.linphone.core.Log;
 import org.linphone.core.LinphoneCall.State;
+import org.linphone.mediastream.video.capture.hwconf.Hacks;
 
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.ListActivity;
-import android.graphics.Color;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.res.Resources;
 import android.os.Bundle;
 import android.os.Handler;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.WindowManager;
 import android.view.View.OnClickListener;
+import android.widget.ArrayAdapter;
 import android.widget.BaseAdapter;
+import android.widget.ListAdapter;
 import android.widget.TextView;
 import android.widget.Toast;
 
+/**
+ * @author Guillaume Beraudo
+ */
 public class ConferenceActivity extends ListActivity implements
 		LinphoneOnCallStateChangedListener, Comparator<LinphoneCall>,
 		OnClickListener {
 
 	private View confHeaderView;
+	static boolean active;
+
 
 	// Start Override to test block
 	protected LinphoneCore lc() {
@@ -66,31 +80,35 @@ public class ConferenceActivity extends ListActivity implements
 
 	// End override to test block
 
-	private static final int ACTIVE_BG_COLOR = Color.parseColor("#777777");
-	public static final int INACTIVE_BG_COLOR = Color.BLACK;
-	public static final int INCOMING_BG_COLOR = Color.parseColor("#336600");
-	public static final int CONFERENCE_BG_COLOR = Color.parseColor("#444444");
 	private static final int numpad_dialog_id = 1;
+	public static final String ADD_CALL = "add_call";
+	public static final String TRANSFER_TO_NEW_CALL = "transfer_to_new_call";
+	public static final String CALL_NATIVE_ID = "call_native_id";
+
+
+	private void workaroundStatusBarBug() {
+		getWindow().setFlags(
+				WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS,
+				WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS);
+	}
 
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		setContentView(R.layout.conferencing);
 		super.onCreate(savedInstanceState);
+
 		confHeaderView = findViewById(R.id.conf_header);
-		confHeaderView.findViewById(R.id.terminate_conference)
-				.setOnClickListener(this);
-		confHeaderView.findViewById(R.id.conf_enter_or_leave_button)
-				.setOnClickListener(this);
+		confHeaderView.setOnClickListener(this);
 
 		findViewById(R.id.addCall).setOnClickListener(this);
 		findViewById(R.id.incallHang).setOnClickListener(this);
 
 		findViewById(R.id.incallNumpadShow).setOnClickListener(this);
+		findViewById(R.id.conf_simple_merge).setOnClickListener(this);
 
 		List<LinphoneCall> calls = getInitialCalls();
 		setListAdapter(new CalleeListAdapter(calls));
-
-		updateConfState();
+		workaroundStatusBarBug();
 	}
 
 	protected void registerLinphoneListener(boolean register) {
@@ -102,30 +120,44 @@ public class ConferenceActivity extends ListActivity implements
 
 	@Override
 	protected void onResume() {
+		active=true;
 		registerLinphoneListener(true);
+		updateConfState();
 		super.onResume();
 	}
 
 	@Override
 	protected void onPause() {
+		active=false;
 		registerLinphoneListener(false);
 		super.onPause();
 	}
 
+	private void enableView(View root, int id, OnClickListener l, boolean enable) {
+		View v = root.findViewById(id);
+		v.setVisibility(enable ? VISIBLE : GONE);
+		v.setOnClickListener(l);
+	}
 	@Override
 	protected Dialog onCreateDialog(final int id) {
-		return new AlertDialog.Builder(this).setView(
-				getLayoutInflater().inflate(R.layout.numpad, null))
-		// .setIcon(R.drawable.logo_linphone_57x57)
-				// .setTitle("Send DTMFs")
-				// .setPositiveButton("hide", new
-				// DialogInterface.OnClickListener() {
-				// public void onClick(DialogInterface dialog, int whichButton)
-				// {
-				// dismissDialog(id);
-				// }
-				// })
-				.create();
+		switch (id) {
+		case numpad_dialog_id:
+			return new AlertDialog.Builder(this).setView(
+					getLayoutInflater().inflate(R.layout.numpad, null))
+			// .setIcon(R.drawable.logo_linphone_57x57)
+					// .setTitle("Send DTMFs")
+					// .setPositiveButton("hide", new
+					// DialogInterface.OnClickListener() {
+					// public void onClick(DialogInterface dialog, int whichButton)
+					// {
+					// dismissDialog(id);
+					// }
+					// })
+					.create();
+		default:
+			throw new RuntimeException("unkown dialog id " + id);
+		}
+
 	}
 
 	// protected void conferenceMerge(boolean hostInTheConference, LinphoneCall
@@ -142,23 +174,20 @@ public class ConferenceActivity extends ListActivity implements
 	}
 
 	private final void updateConfState() {
-		if (lc().getCallsNb() == 0)
+		if (lc().getCallsNb() == 0) {
+			setResult(RESULT_OK);
 			finish();
+		}
+			
 		boolean inConf = lc().isInConference();
-		confHeaderView.setBackgroundColor(inConf ? ACTIVE_BG_COLOR
-				: INACTIVE_BG_COLOR);
 
-		confHeaderView
-				.setVisibility(lc().getConferenceSize() > 0 ? View.VISIBLE
-						: View.GONE);
+		int bgColor = getResources().getColor(inConf? R.color.conf_active_bg_color : android.R.color.transparent);
+		confHeaderView.setBackgroundColor(bgColor);
+		confHeaderView.setVisibility(lc().getConferenceSize() > 0 ? VISIBLE: GONE);
 
-		TextView v = (TextView) confHeaderView
-				.findViewById(R.id.conf_self_attending);
-		v.setText(inConf ? R.string.in_conf : R.string.out_conf);
-
-		v = (TextView) confHeaderView
-				.findViewById(R.id.conf_enter_or_leave_button);
-		v.setText(inConf ? R.string.in_conf_leave : R.string.out_conf_enter);
+//		TextView v = (TextView) confHeaderView
+//				.findViewById(R.id.conf_self_attending);
+//		v.setText(inConf ? R.string.in_conf : R.string.out_conf);
 	}
 
 	public void onClick(View v) {
@@ -169,31 +198,125 @@ public class ConferenceActivity extends ListActivity implements
 					Toast.LENGTH_LONG).show();
 			// startActivityForResult(new Intent().setClass(this,
 			// LinphoneContactSelectorActivity.class), 0);
+			lc().pauseAllCalls();
+			setResult(RESULT_OK, new Intent().putExtra(ADD_CALL, true));
+			finish();
 			break;
-		case R.id.conf_enter_or_leave_button:
-			if (lc().isInConference()) {
-				lc().leaveConference();
-			} else {
-				lc().enterConference();
-			}
-			break;
-		case R.id.terminate_conference:
-			lc().terminateConference();
-			findViewById(R.id.conf_header).setVisibility(View.GONE);
+		case R.id.conf_header:
+			View content = getLayoutInflater().inflate(R.layout.conf_choices_admin, null);
+			final Dialog dialog = new AlertDialog.Builder(ConferenceActivity.this).setView(content).create();
+			boolean isInConference = lc().isInConference();
+			OnClickListener l = new OnClickListener() {
+				public void onClick(View v) {
+					switch (v.getId()) {
+					case R.id.conf_add_all_to_conference_button:
+						lc().addAllToConference();
+						break;
+					case R.id.conf_enter_button:
+						lc().enterConference();
+						break;
+					case R.id.conf_leave_button:
+						lc().leaveConference();
+						break;
+					case R.id.conf_terminate_button:
+						lc().terminateConference();
+						findViewById(R.id.conf_header).setVisibility(GONE);
+						break;
+					default:
+						break;
+					}
+					dialog.dismiss();
+				}
+			};
+			enableView(content, R.id.conf_enter_button, l, !isInConference);
+			enableView(content, R.id.conf_leave_button, l, isInConference);
+			content.findViewById(R.id.conf_terminate_button).setOnClickListener(l);
+			content.findViewById(R.id.conf_add_all_to_conference_button).setOnClickListener(l);
+
+			dialog.show();
 			break;
 		case R.id.incallHang:
 			lc().terminateAllCalls();
+			setResult(RESULT_OK);
 			finish();
 			break;
 		case R.id.incallNumpadShow:
 			showDialog(numpad_dialog_id);
 			break;
+		case R.id.conf_simple_merge:
+			lc().addAllToConference();
+			break;
 		default:
 			break;
 		}
 
 	}
 
+	private class CallActionListener implements OnClickListener {
+		private LinphoneCall call;
+		private Dialog dialog;
+		public CallActionListener(LinphoneCall call, Dialog dialog) {
+			this.call = call;
+			this.dialog = dialog;
+		}
+		public CallActionListener(LinphoneCall call) {
+			this.call = call;
+		}
+		public void onClick(View v) {
+			switch (v.getId()) {
+			case R.id.merge_to_conference:
+				lc().addToConference(call);
+				break;
+			case R.id.terminate_call:
+				lc().terminateCall(call);
+				break;
+			case R.id.pause:
+				lc().pauseCall(call);
+				break;
+			case R.id.resume:
+				lc().resumeCall(call);
+				break;
+			case R.id.unhook_call:
+				LinphoneCall currentCall = lc().getCurrentCall();
+				if (currentCall != null) lc().pauseCall(currentCall);
+				try {
+					lc().acceptCall(call);
+				} catch (LinphoneCoreException e) {
+					throw new RuntimeException(e);
+				}
+				break;
+			case R.id.transfer_existing:
+				Toast.makeText(ConferenceActivity.this, "Transfer choice selected", Toast.LENGTH_LONG).show();
+				@SuppressWarnings("unchecked") final List<LinphoneCall> existingCalls = lc().getCalls();
+				existingCalls.remove(call);
+				final List<String> numbers = new ArrayList<String>(existingCalls.size());
+				Resources r = getResources();
+				for(LinphoneCall c : existingCalls) {
+					numbers.add(LinphoneManager.extractADisplayName(r, c.getRemoteAddress()));
+				}
+				ListAdapter adapter = new ArrayAdapter<String>(ConferenceActivity.this, android.R.layout.select_dialog_item, numbers);
+				DialogInterface.OnClickListener l = new DialogInterface.OnClickListener() {
+					public void onClick(DialogInterface dialog, int which) {
+						lc().transferCallToAnother(call, existingCalls.get(which));
+					}
+				};
+				new AlertDialog.Builder(ConferenceActivity.this).setAdapter(adapter, l).create().show();
+				break;
+			case R.id.transfer_new:
+				Toast.makeText(ConferenceActivity.this, "Transfer choice selected : to do, create activity to select new call", Toast.LENGTH_LONG).show();
+//				setResult(RESULT_OK, new Intent().putExtra(TRANSFER_TO_NEW_CALL, true));
+//				setResult(RESULT_OK, new Intent().putExtra(CALL_NATIVE_ID, Hacks.ptrOf(call)));
+//				finish();
+				break;
+			case R.id.remove_from_conference:
+				lc().removeFromConference(call);
+				break;
+			default:
+				throw new RuntimeException("unknown id " + v.getId());
+			}
+			if (dialog != null) dialog.dismiss();
+		}
+	}
 	private class CalleeListAdapter extends BaseAdapter {
 		private List<LinphoneCall> linphoneCalls;
 
@@ -219,10 +342,10 @@ public class ConferenceActivity extends ListActivity implements
 				return false;
 			int count = 0;
 			for (LinphoneCall call : linphoneCalls) {
-				int stateId = call.getState().value();
-				boolean connectionEstablished = stateId == State.ID_STREAMS_RUNNING
-						|| stateId == State.ID_PAUSED
-						|| stateId == State.ID_PAUSED_BY_REMOTE;
+				final LinphoneCall.State state = call.getState();
+				boolean connectionEstablished = state == State.StreamsRunning
+						|| state == State.Paused
+						|| state == State.PausedByRemote;
 				if (connectionEstablished)
 					count++;
 				if (count >= 2)
@@ -231,137 +354,166 @@ public class ConferenceActivity extends ListActivity implements
 			return false;
 		}
 
+		private void setVisibility(View v, int id, boolean visible) {
+			v.findViewById(id).setVisibility(visible ? VISIBLE : GONE);
+		}
+		private void setVisibility(View v, boolean visible) {
+			v.setVisibility(visible ? VISIBLE : GONE);
+		}
+		private void setStatusLabel(View v, State state, boolean inConf, boolean activeOne) {
+			String statusLabel = getStateText(state);
+
+			if (activeOne)
+				statusLabel=getString(R.string.status_active_call);
+
+			if (inConf)
+				statusLabel=getString(R.string.status_conf_call);
+			
+			((TextView) v.findViewById(R.id.status_label)).setText(statusLabel);
+		}
+
 		public View getView(int position, View v, ViewGroup parent) {
 			if (v == null) {
 				v = getLayoutInflater().inflate(R.layout.conf_callee, null);
 			}
 
-			LinphoneCall call = linphoneCalls.get(position);
-			int stateId = call.getState().value();
+			final LinphoneCall call = linphoneCalls.get(position);
+			final LinphoneCall.State state = call.getState();
 
 			((TextView) v.findViewById(R.id.name)).setText(call
 					.getRemoteAddress().getDisplayName());
 			((TextView) v.findViewById(R.id.address)).setText(call
 					.getRemoteAddress().getUserName());
 
-			boolean isInConference = call.isInConference();
+			final boolean isInConference = call.isInConference();
 			boolean currentlyActiveCall = !isInConference
-					&& stateId == State.ID_STREAMS_RUNNING;
-			int bgColor = INACTIVE_BG_COLOR;
-			if (stateId == State.ID_INCOMING_RECEIVED) {
-				bgColor = INCOMING_BG_COLOR;
-			} else if (currentlyActiveCall) {
-				bgColor = ACTIVE_BG_COLOR;
-			} else if (isInConference) {
-				bgColor = CONFERENCE_BG_COLOR;
-			}
-			v.setBackgroundColor(bgColor);
+					&& state == State.StreamsRunning;
 
-			boolean connectionEstablished = stateId == State.ID_STREAMS_RUNNING
-					|| stateId == State.ID_PAUSED
-					|| stateId == State.ID_PAUSED_BY_REMOTE;
+			setStatusLabel(v, state, isInConference, currentlyActiveCall);
+
+
+			int bgDrawableId = R.drawable.conf_callee_selector_normal;
+			if (state == State.IncomingReceived) {
+				bgDrawableId = R.drawable.conf_callee_selector_incoming;
+			} else if (currentlyActiveCall) {
+				bgDrawableId = R.drawable.conf_callee_selector_active;
+			} else if (isInConference) {
+				bgDrawableId = R.drawable.conf_callee_selector_inconf;
+			}
+			v.setBackgroundResource(bgDrawableId);
+
+			boolean connectionEstablished = state == State.StreamsRunning
+					|| state == State.Paused
+					|| state == State.PausedByRemote;
 			View confButton = v.findViewById(R.id.merge_to_conference);
-			boolean showMergeToConf = !isInConference && connectionEstablished
+			final boolean showMergeToConf = !isInConference && connectionEstablished
 					&& aConferenceIsPossible();
-			confButton
-					.setVisibility(showMergeToConf ? View.VISIBLE : View.GONE);
+			setVisibility(confButton, false);
 
 			View unhookCallButton = v.findViewById(R.id.unhook_call);
-			boolean showUnhook = stateId == State.ID_INCOMING_RECEIVED;
-			unhookCallButton.setVisibility(showUnhook ? View.VISIBLE
-					: View.GONE);
+			boolean showUnhook = state == State.IncomingReceived;
+			setVisibility(unhookCallButton, showUnhook);
 
 			View terminateCallButton = v.findViewById(R.id.terminate_call);
-			terminateCallButton.setVisibility(!isInConference ? View.VISIBLE
-					: View.GONE);
+			boolean showTerminate = state == State.IncomingReceived;
+			setVisibility(terminateCallButton, showTerminate);
 
 			View pauseButton = v.findViewById(R.id.pause);
-			boolean showPause = !isInConference
-					&& call.getState().equals(State.StreamsRunning);
-			pauseButton.setVisibility(showPause ? View.VISIBLE : View.GONE);
+			final boolean showPause = !isInConference
+					&& state == State.StreamsRunning;
+			setVisibility(pauseButton, false);
 
 			View resumeButton = v.findViewById(R.id.resume);
-			boolean showResume = !isInConference
-					&& call.getState().equals(State.Paused);
-			resumeButton.setVisibility(showResume ? View.VISIBLE : View.GONE);
+			final boolean showResume = !isInConference
+					&& state == State.Paused;
+			setVisibility(resumeButton, false);
 
-			v.findViewById(R.id.addVideo).setVisibility(
-					!showUnhook && linphoneCalls.size() == 1 ? View.VISIBLE
-							: View.GONE);
+			View removeFromConfButton = v.findViewById(R.id.remove_from_conference);
+			setVisibility(removeFromConfButton, false);
+			
+			setVisibility(v, R.id.addVideo, !showUnhook && linphoneCalls.size() == 1);
 
-			createAndAttachCallViewClickListener(position, confButton,
-					unhookCallButton, terminateCallButton, pauseButton,
-					resumeButton);
-			return v;
-		}
+			boolean statusPaused = state== State.Paused || state == State.PausedByRemote;
+			setVisibility(v, R.id.callee_status_paused, statusPaused);
 
-		private void createAndAttachCallViewClickListener(final int position,
-				final View confButton, final View unhookCallButton,
-				final View terminateCallButton, final View pauseButton,
-				final View resumeButton) {
-			OnClickListener l = new OnClickListener() {
-				public void onClick(View v) {
-					LinphoneCall call = linphoneCalls.get(position);
-					if (v == confButton) {
-						lc().addToConference(call);
-					} else if (v == terminateCallButton) {
-						lc().terminateCall(call);
-					} else if (v == pauseButton) {
-						lc().pauseCall(call);
-					} else if (v == resumeButton) {
-						lc().resumeCall(call);
-					} else if (v == unhookCallButton) {
-						LinphoneCall currentCall = lc().getCurrentCall();
-						if (currentCall != null) lc().pauseCall(currentCall);
-						try {
-							lc().acceptCall(call);
-						} catch (LinphoneCoreException e) {
-							throw new RuntimeException(e);
-						}
-					}
-				}
-			};
+			setVisibility(v, R.id.callee_status_inconf, isInConference);
+			
+			final OnClickListener l = new CallActionListener(call);
 			confButton.setOnClickListener(l);
 			terminateCallButton.setOnClickListener(l);
 			pauseButton.setOnClickListener(l);
 			resumeButton.setOnClickListener(l);
 			unhookCallButton.setOnClickListener(l);
+			removeFromConfButton.setOnClickListener(l);
+
+			v.setOnClickListener(new OnClickListener() {
+				public void onClick(View v) {
+					View content = getLayoutInflater().inflate(R.layout.conf_choices_dialog, null);
+					Dialog dialog = new AlertDialog.Builder(ConferenceActivity.this).setView(content).create();
+					OnClickListener l = new CallActionListener(call, dialog);
+					enableView(content, R.id.transfer_existing, l, !isInConference);
+					enableView(content, R.id.transfer_new, l, !isInConference);
+					enableView(content, R.id.remove_from_conference, l, isInConference);
+					enableView(content, R.id.merge_to_conference, l, showMergeToConf);
+					enableView(content, R.id.pause, l,!isInConference && showPause);
+					enableView(content, R.id.resume, l, !isInConference && showResume);
+					enableView(content, R.id.terminate_call, l, true);
+					dialog.show();
+				}
+			});
+
+			return v;
 		}
 	}
 
+	private String getStateText(State state) {
+		int id;
+		if (state == State.IncomingReceived) {
+			id=R.string.state_incoming_received;
+		} else if (state == State.OutgoingRinging) {
+			id=R.string.state_outgoing_ringing;
+		} else if (state == State.Paused) {
+			id=R.string.state_paused;
+		} else if (state == State.PausedByRemote) {
+			id=R.string.state_paused_by_remote;
+		} else {
+			return "";
+		}
+		return getString(id);
+	}
+
 	private Handler mHandler = new Handler();
 
 	public void onCallStateChanged(final LinphoneCall call, final State state,
 			final String message) {
+		final String stateStr = call + " " + state.toString();
+		Log.d("ConferenceActivity received state ",stateStr);
 		mHandler.post(new Runnable() {
 			public void run() {
 				CalleeListAdapter adapter = (CalleeListAdapter) getListAdapter();
-
-				String stateStr = call + " " + state.toString();
-				Log.d("ConferenceActivity received state ",stateStr);
-				switch (state.value()) {
-				case State.ID_INCOMING_RECEIVED:
-				case State.ID_OUTGOING_RINGING:
-					adapter.linphoneCalls.add(call);
-					Collections.sort(adapter.linphoneCalls,
-							ConferenceActivity.this);
-					adapter.notifyDataSetInvalidated();
-					break;
-				case State.ID_PAUSED:
-				case State.ID_PAUSED_BY_REMOTE:
-				case State.ID_STREAMS_RUNNING:
+				Log.d("ConferenceActivity applying state ",stateStr);
+				boolean showSimpleActions = lc().getConferenceSize() == 0 && lc().getCallsNb() == 2;
+				findViewById(R.id.conf_simple_merge).setVisibility(showSimpleActions ? VISIBLE : GONE);
+				if (state == State.IncomingReceived || state == State.OutgoingRinging) {
+					if (!adapter.linphoneCalls.contains(call)) {
+						adapter.linphoneCalls.add(call);
+						Collections.sort(adapter.linphoneCalls,
+								ConferenceActivity.this);
+						adapter.notifyDataSetInvalidated();
+						adapter.notifyDataSetChanged();
+					} else {
+						Log.e("Call should not be in the call lists : " + stateStr);
+					}
+				} else if (state == State.Paused || state == State.PausedByRemote || state == State.StreamsRunning) {
 					Collections.sort(adapter.linphoneCalls,
 							ConferenceActivity.this);
 					adapter.notifyDataSetChanged();
-					break;
-				case State.ID_CALL_END:
+				} else if (state == State.CallEnd) {
 					adapter.linphoneCalls.remove(call);
 					Collections.sort(adapter.linphoneCalls,
 							ConferenceActivity.this);
 					adapter.notifyDataSetInvalidated();
-					break;
-				default:
-					break;
+					adapter.notifyDataSetChanged();
 				}
 
 				updateConfState();
@@ -400,17 +552,17 @@ public class ConferenceActivity extends ListActivity implements
 	 * // bellow, ringings and incoming int c1State = c1.getState().value(); int
 	 * c2State = c2.getState().value();
 	 * 
-	 * boolean c1StateIsEstablishing = c1State == State.ID_INCOMING_RECEIVED ||
+	 * boolean c1StateIsEstablishing = c1State == State.IncomingReceived ||
 	 * c1State == State.ID_OUTGOING_RINGING; boolean c2StateIsEstablishing =
-	 * c2State == State.ID_INCOMING_RECEIVED || c2State ==
+	 * c2State == State.IncomingReceived || c2State ==
 	 * State.ID_OUTGOING_RINGING;
 	 * 
 	 * // Xor only one establishing state if (c1StateIsEstablishing ^
 	 * c2StateIsEstablishing) { // below return !c1StateIsEstablishing ? -1 : 1;
 	 * }
 	 * 
-	 * // Xor only one paused state if (c1State == State.ID_PAUSED ^ c2State ==
-	 * State.ID_PAUSED) { return c1State == State.ID_PAUSED ? -1 : 1; }
+	 * // Xor only one paused state if (c1State == State.Paused ^ c2State ==
+	 * State.Paused) { return c1State == State.Paused ? -1 : 1; }
 	 * 
 	 * return compUserName; //Duration() - c1.getDuration(); }
 	 */
diff --git a/src/org/linphone/DialerActivity.java b/src/org/linphone/DialerActivity.java
index 8027d4449..cf365e2a3 100644
--- a/src/org/linphone/DialerActivity.java
+++ b/src/org/linphone/DialerActivity.java
@@ -27,6 +27,7 @@ import org.linphone.core.LinphoneCore;
 import org.linphone.core.Log;
 import org.linphone.core.LinphoneCall.State;
 import org.linphone.mediastream.Version;
+import org.linphone.mediastream.video.capture.hwconf.Hacks;
 import org.linphone.ui.AddVideoButton;
 import org.linphone.ui.AddressAware;
 import org.linphone.ui.AddressText;
@@ -47,6 +48,7 @@ import android.os.Bundle;
 import android.os.PowerManager;
 import android.preference.PreferenceManager;
 import android.view.View;
+import android.view.ViewGroup;
 import android.view.View.OnClickListener;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -311,7 +313,8 @@ public class DialerActivity extends LinphoneManagerWaitActivity implements Linph
 	@Override
 	protected void onPrepareDialog(int id, Dialog dialog) {
 		if (id == incomingCallDialogId) {
-			String from = LinphoneManager.getInstance().extractIncomingRemoteName();
+			LinphoneAddress address = LinphoneManager.getLc().getRemoteAddress();
+			String from = LinphoneManager.extractIncomingRemoteName(getResources(), address);
 			String msg = String.format(getString(R.string.incoming_call_dialog_title), from);
 			((AlertDialog) dialog).setMessage(msg);
 		} else {
@@ -490,5 +493,56 @@ public class DialerActivity extends LinphoneManagerWaitActivity implements Linph
 		}
 		super.onResume();
 	}
+
+
+	private void switchControlRow(ViewGroup v, OnClickListener l) {
+		final View ok = v.getChildAt(0);
+		final View cancel = v.getChildAt(1);
+		ok.setOnClickListener(l);
+		cancel.setOnClickListener(l);
+		findViewById(R.id.IncallControlRow).setVisibility(View.GONE);
+		findViewById(R.id.CallControlRow).setVisibility(View.GONE);
+		v.setVisibility(View.VISIBLE);
+	}
+	public void configureForAddingCall() {
+		ViewGroup v = (ViewGroup) findViewById(R.id.AddCallControlRow);
+		OnClickListener l = new OnClickListener() {
+			public void onClick(View v) {
+				ViewGroup group = (ViewGroup) v.getParent();
+				if (v == group.getChildAt(1)) {
+					LinphoneActivity.instance().startConferenceActivity();
+				} else {
+					LinphoneManager.getInstance().newOutgoingCall(mAddress);
+				}
+			}
+		};
+		switchControlRow(v, l);
+	}
+
+
+	public void configureForTransferingCall(final long callNativeId) {
+		throw new RuntimeException("create another activity for this");
+//		ViewGroup v = (ViewGroup) findViewById(R.id.transferCallControlRow);
+//		OnClickListener l = new OnClickListener() {
+//			public void onClick(View v) {
+//				ViewGroup group = (ViewGroup) v.getParent();
+//				if (v == group.getChildAt(1)) {
+//					LinphoneActivity.instance().startConferenceActivity();
+//				} else {
+//					LinphoneManager.getLc().transferCall(Hacks.createCall(callNativeId),
+//							mAddress.getText().toString());
+//				}
+//			}
+//		};
+//		switchControlRow(v, l);
+	}
+
+
+	public void configureForDialer() {
+		findViewById(R.id.AddCallControlRow).setVisibility(R.id.transferCallControlRow);
+		findViewById(R.id.AddCallControlRow).setVisibility(View.GONE);
+		findViewById(R.id.IncallControlRow).setVisibility(View.GONE);
+		findViewById(R.id.CallControlRow).setVisibility(View.VISIBLE);
+	}
 	
 }
diff --git a/src/org/linphone/LinphoneActivity.java b/src/org/linphone/LinphoneActivity.java
index 1f5a3b84a..b237c9925 100644
--- a/src/org/linphone/LinphoneActivity.java
+++ b/src/org/linphone/LinphoneActivity.java
@@ -150,8 +150,8 @@ public class LinphoneActivity extends TabActivity implements SensorEventListener
 	
 	@Override
 	protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-		
-		if (requestCode == FIRST_LOGIN_ACTIVITY) {
+		switch (requestCode) {
+		case FIRST_LOGIN_ACTIVITY:
 			if (resultCode == RESULT_OK) {
 				Toast.makeText(this, getString(R.string.ec_calibration_launch_message), Toast.LENGTH_LONG).show();
 				try {
@@ -172,6 +172,22 @@ public class LinphoneActivity extends TabActivity implements SensorEventListener
 				finish();
 				stopService(new Intent(ACTION_MAIN).setClass(this, LinphoneService.class));
 			}
+			break;
+		case conference_activity:
+			if (data == null) {
+				DialerActivity.instance().configureForDialer();
+			} else if (data.getBooleanExtra(ConferenceActivity.ADD_CALL, false)) {
+				DialerActivity.instance().configureForAddingCall();
+				gotToDialer();
+			} else if (data.getBooleanExtra(ConferenceActivity.TRANSFER_TO_NEW_CALL, false)) {
+				long callId = data.getLongExtra(ConferenceActivity.CALL_NATIVE_ID, 0l);
+				if (callId == 0) throw new RuntimeException("call id is 0");
+				DialerActivity.instance().configureForTransferingCall(callId);
+				gotToDialer();
+			}
+			break;
+		default:
+			break;
 		}
 		
 		super.onActivityResult(requestCode, resultCode, data);
@@ -507,6 +523,8 @@ public class LinphoneActivity extends TabActivity implements SensorEventListener
 	}
 
 	public void startConferenceActivity() {
+		if (ConferenceActivity.active) return;
+
 		mHandler.post(new Runnable() {
 			public void run() {
 				startActivityForResult(new Intent().setClass(
diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java
index 6bfe23710..69985dec8 100644
--- a/src/org/linphone/LinphoneManager.java
+++ b/src/org/linphone/LinphoneManager.java
@@ -45,7 +45,6 @@ import java.util.Timer;
 import java.util.TimerTask;
 
 import org.linphone.LinphoneSimpleListener.LinphoneServiceListener;
-import org.linphone.core.Hacks;
 import org.linphone.core.LinphoneAddress;
 import org.linphone.core.LinphoneAuthInfo;
 import org.linphone.core.LinphoneCall;
@@ -258,10 +257,10 @@ public final class LinphoneManager implements LinphoneCoreListener {
 	public void newOutgoingCall(AddressType address) {
 		String to = address.getText().toString();
 
-		if (mLc.isIncall()) {
-			listenerDispatcher.tryingNewOutgoingCallButAlreadyInCall();
-			return;
-		}
+//		if (mLc.isIncall()) {
+//			listenerDispatcher.tryingNewOutgoingCallButAlreadyInCall();
+//			return;
+//		}
 		LinphoneAddress lAddress;
 		try {
 			lAddress = mLc.interpretUrl(to);
diff --git a/src/org/linphone/LinphoneService.java b/src/org/linphone/LinphoneService.java
index 4e0b1c9e8..19a189a77 100644
--- a/src/org/linphone/LinphoneService.java
+++ b/src/org/linphone/LinphoneService.java
@@ -22,7 +22,6 @@ import java.io.IOException;
 
 import org.linphone.LinphoneManager.NewOutgoingCallUiListener;
 import org.linphone.LinphoneSimpleListener.LinphoneServiceListener;
-import org.linphone.core.Hacks;
 import org.linphone.core.LinphoneCall;
 import org.linphone.core.Log;
 import org.linphone.core.OnlineStatus;
diff --git a/src/org/linphone/core/LinphoneCoreImpl.java b/src/org/linphone/core/LinphoneCoreImpl.java
index ab87a17b2..a5b4b718c 100644
--- a/src/org/linphone/core/LinphoneCoreImpl.java
+++ b/src/org/linphone/core/LinphoneCoreImpl.java
@@ -477,7 +477,7 @@ class LinphoneCoreImpl implements LinphoneCore {
 	public synchronized void setZrtpSecretsCache(String file) {
 		setZrtpSecretsCache(nativePtr,file);
 	}
-	public void enableEchoLimiter(boolean val) {
+	public synchronized void enableEchoLimiter(boolean val) {
 		enableEchoLimiter(nativePtr,val);
 	}
 	public void setVideoDevice(int id) {
@@ -492,43 +492,38 @@ class LinphoneCoreImpl implements LinphoneCore {
 
 
 	private native void leaveConference(long nativePtr);	
-	public void leaveConference() {
+	public synchronized void leaveConference() {
 		leaveConference(nativePtr);
 	}
 
 	private native void enterConference(long nativePtr);	
-	public void enterConference() {
+	public synchronized void enterConference() {
 		enterConference(nativePtr);
 	}
 
 	private native boolean isInConference(long nativePtr);
-	public boolean isInConference() {
+	public synchronized boolean isInConference() {
 		return isInConference(nativePtr);
 	}
 
-	private native void addToConference(long nativePtr, long nativePtrLcall);
-	public void addToConference(LinphoneCall call, boolean addOthersToNewConference) {
-		addToConference(nativePtr, ((LinphoneCallImpl)call).nativePtr);
-	}
-
 	private native void terminateConference(long nativePtr);
-	public void terminateConference() {
+	public synchronized void terminateConference() {
 		terminateConference(nativePtr);
 	}
 	private native int getConferenceSize(long nativePtr);
-	public int getConferenceSize() {
+	public synchronized int getConferenceSize() {
 		return getConferenceSize(nativePtr);
 	}
 	private native int getCallsNb(long nativePtr);
-	public int getCallsNb() {
+	public synchronized int getCallsNb() {
 		return getCallsNb(nativePtr);
 	}
 	private native void terminateAllCalls(long nativePtr);
-	public void terminateAllCalls() {
+	public synchronized void terminateAllCalls() {
 		terminateAllCalls(nativePtr);
 	}
 	private native long getCall(long nativePtr, int position);
-	@SuppressWarnings("unchecked") public List getCalls() {
+	@SuppressWarnings("unchecked") public synchronized List getCalls() {
 		int size = getCallsNb(nativePtr);
 		List<LinphoneCall> calls = new ArrayList<LinphoneCall>(size);
 		for (int i=0; i < size; i++) {
@@ -537,27 +532,31 @@ class LinphoneCoreImpl implements LinphoneCore {
 		return calls;
 	}
 	private native void addAllToConference(long nativePtr);
-	public void addAllToConference() {
+	public synchronized void addAllToConference() {
 		addAllToConference(nativePtr);
 		
 	}
-	private native void addToConference(long nativePtr);
-	public void addToConference(LinphoneCall call) {
-		addToConference(nativePtr);
+	private native void addToConference(long nativePtr, long nativePtrLcall);
+	public synchronized void addToConference(LinphoneCall call) {
+		addToConference(nativePtr, getCallPtr(call));
 		
 	}
 	private native void removeFromConference(long nativePtr);
-	public void removeFromConference(LinphoneCall call) {
-		removeFromConference(nativePtr);
+	public synchronized void removeFromConference(LinphoneCall call) {
+		removeFromConference(getCallPtr(call));
 	}
 
-	public void transferCall(LinphoneCall call, String referTo) {
-		// TODO Auto-generated method stub
-		
+	private long getCallPtr(LinphoneCall call) {
+		return ((LinphoneCallImpl)call).nativePtr;
 	}
-	public void transferCallToAnother(LinphoneCall callToTransfer,
-			LinphoneCall destination) {
-		// TODO Auto-generated method stub
-		
+
+	private native int transferCall(long nativePtr, long callPtr, String referTo);
+	public synchronized void transferCall(LinphoneCall call, String referTo) {
+		transferCall(nativePtr, getCallPtr(call), referTo);
+	}
+
+	private native int transferCallToAnother(long nativePtr, long callPtr, long destPtr);
+	public synchronized void transferCallToAnother(LinphoneCall call, LinphoneCall dest) {
+		transferCallToAnother(nativePtr, getCallPtr(call), getCallPtr(dest));
 	}
 }
diff --git a/test/org/linphone/TestConferenceActivity.java b/test/org/linphone/TestConferenceActivity.java
index 212cdaf71..9d9adfc16 100644
--- a/test/org/linphone/TestConferenceActivity.java
+++ b/test/org/linphone/TestConferenceActivity.java
@@ -59,6 +59,14 @@ public class TestConferenceActivity extends ConferenceActivity {
 			}
 		}, millis);
 	}
+	private void delayedCallEvent(final LinphoneCall call, final State targetState, int millis) {
+		mHandler.postDelayed(new Runnable() {
+			public void run() {
+				((LinphoneCallTest)call).state = targetState;
+				onCallStateChanged(call, call.getState(), "simulated delayed state change " + targetState);
+			}
+		}, millis);
+	}
 
 	protected final List<LinphoneCall> getInitialCalls() {
 		List<LinphoneCall> calls = new ArrayList<LinphoneCall>();
@@ -105,7 +113,8 @@ public class TestConferenceActivity extends ConferenceActivity {
 			if (isInConference()) {
 				leaveConference();
 			} else {
-				pauseCall(getCurrentCall());
+				LinphoneCall current = getCurrentCall();
+				if (current != null) pauseCall(current);
 			}
 			changeState(call, State.StreamsRunning);
 		}
@@ -180,6 +189,7 @@ public class TestConferenceActivity extends ConferenceActivity {
 		}
 		public void playDtmf(char number, int duration) {}
 		public boolean resumeCall(LinphoneCall call) {
+			if (isInConference()) leaveConference();
 			pauseAllCalls();
 			changeState(call, State.StreamsRunning);
 			return true;
@@ -230,9 +240,12 @@ public class TestConferenceActivity extends ConferenceActivity {
 		}
 		public void addAllToConference() {
 			for (LinphoneCall c : calls) {
-				int stateId = c.getState().value();
-				boolean connectionEstablished = stateId == State.ID_STREAMS_RUNNING || stateId == State.ID_PAUSED || stateId == State.ID_PAUSED_BY_REMOTE;
-				if (connectionEstablished) changeStateInConf(c, true);
+				final LinphoneCall.State state = c.getState();
+				boolean connectionEstablished = state == State.StreamsRunning || state == State.Paused || state == State.PausedByRemote;
+				if (connectionEstablished) {
+					changeState(c, State.StreamsRunning);
+					changeStateInConf(c, true);
+				}
 			}
 			enterConference();
 		}
@@ -241,6 +254,7 @@ public class TestConferenceActivity extends ConferenceActivity {
 				addAllToConference();
 			} else {
 				boolean mergingActiveCall = call.equals(getCurrentCall());
+				changeState(call, State.StreamsRunning);
 				changeStateInConf(call, true);
 				if (mergingActiveCall) enterConference();
 			}
@@ -278,9 +292,22 @@ public class TestConferenceActivity extends ConferenceActivity {
 			return new ArrayList<LinphoneCall>(calls);
 		}
 		public void removeFromConference(LinphoneCall call) {
-			changeState(call, State.StreamsRunning);
+			changeStateInConf(call, false);
+			changeState(call, State.Paused);
 		}
-		
+		public void transferCall(LinphoneCall call, String referTo) {
+			terminateCall(call);
+		}
+		public void transferCallToAnother(LinphoneCall callToTransfer, LinphoneCall destination) {
+			if (!State.Paused.equals(callToTransfer.getState())) {
+				throw new RuntimeException("call to transfer should be paused first");
+			}
+			terminateCall(callToTransfer);
+			delayedCallEvent(destination, State.CallEnd, 3000);
+		}
+		public int getVideoDevice() {return 0;}
+		public void setDeviceRotation(int rotation) {}
+		public void setVideoDevice(int id) {}
 	}
 
 
@@ -338,6 +365,7 @@ public class TestConferenceActivity extends ConferenceActivity {
 		public boolean isEchoCancellationEnabled() {return false;}
 		public boolean isEchoLimiterEnabled() {return false;}
 		public boolean isInConference() { return inConf;}
+		public boolean cameraEnabled() {return false;}
 	}
 
 

From 54388a2026bcc43c4751ee1445e30f1bbc1119cf Mon Sep 17 00:00:00 2001
From: Guillaume Beraudo <guillaume.beraudo@belledonne-communications.com>
Date: Tue, 27 Sep 2011 10:15:51 +0200
Subject: [PATCH 04/62] Incoming call activity.

---
 AndroidManifest.xml                        | 19 ++++++-
 res/layout/incoming.xml                    | 54 ++++++++++++++++++++
 src/org/linphone/DialerActivity.java       | 15 ++++--
 src/org/linphone/IncomingCallActivity.java | 59 ++++++++++++++++++++++
 4 files changed, 143 insertions(+), 4 deletions(-)
 create mode 100644 res/layout/incoming.xml
 create mode 100644 src/org/linphone/IncomingCallActivity.java

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 2ad149b55..5286ed535 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -37,13 +37,30 @@
         </activity>
 
 
+        <activity android:name="org.linphone.IncomingCallActivity" android:theme="@android:style/Theme.NoTitleBar.Fullscreen">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+            </intent-filter>
+         </activity>
+
+        <activity android:name="org.linphone.UriPickerActivity" android:theme="@android:style/Theme.NoTitleBar">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+            </intent-filter>
+         </activity>
+        <activity android:name="org.linphone.UriPickerActivity$DialerActivity" android:theme="@android:style/Theme.NoTitleBar">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+            </intent-filter>
+         </activity>
+
         <activity android:name="org.linphone.FirstLoginActivity" android:theme="@android:style/Theme.NoTitleBar.Fullscreen">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
             </intent-filter>
          </activity>
 		<activity android:name="org.linphone.ConferenceActivity"
-                    android:launchMode="singleTop"
+		            android:launchMode="singleTop"
         			android:theme="@android:style/Theme.NoTitleBar.Fullscreen">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/res/layout/incoming.xml b/res/layout/incoming.xml
new file mode 100644
index 000000000..16ffcc4d3
--- /dev/null
+++ b/res/layout/incoming.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout android:orientation="vertical"
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="fill_parent" android:layout_height="fill_parent">
+
+
+	<TextView android:layout_width="wrap_content" android:layout_height="wrap_content"
+		android:layout_centerHorizontal="true"
+		android:layout_marginTop="25sp" android:layout_alignParentTop="true"
+		android:text="Incoming call" android:textAppearance="?android:attr/textAppearanceLarge">
+	</TextView>
+
+	<LinearLayout android:layout_width="wrap_content"
+		android:layout_height="wrap_content" android:orientation="vertical"
+		android:layout_centerInParent="true">
+		<TextView android:id="@+id/incoming_caller_name"
+			android:layout_width="wrap_content" android:layout_height="wrap_content"
+			android:text="Caller name" android:textAppearance="?android:attr/textAppearanceLarge"
+			android:layout_gravity="center_horizontal">
+		</TextView>
+		<TextView android:id="@+id/incoming_caller_number"
+			android:layout_width="wrap_content" android:layout_height="wrap_content"
+			android:layout_marginTop="8sp"
+			android:text="Caller phone"
+			android:textAppearance="?android:attr/textAppearance"
+			android:layout_gravity="center_horizontal">
+		</TextView>
+	</LinearLayout>
+
+
+	<org.linphone.ui.CallButton  android:src="@drawable/startcall_green" android:layout_width="wrap_content"
+		android:layout_height="wrap_content" android:id="@+id/Answer"
+		android:text="answer"
+		android:textAppearance="?android:attr/textAppearanceLarge"
+		android:layout_alignParentLeft="true" android:layout_marginBottom="40sp"
+		android:layout_alignParentBottom="true"/>
+
+	<org.linphone.ui.HangCallButton android:src="@drawable/stopcall_red" android:layout_width="wrap_content"
+		android:layout_height="wrap_content" android:id="@+id/Decline"
+		android:text="decline" 
+		android:textAppearance="?android:attr/textAppearanceLarge"
+		android:layout_alignParentRight="true" android:layout_alignBottom="@id/Answer"/>
+
+
+
+<!--	<org.linphone.ui.CallButton  android:src="@drawable/startvideo_green" android:layout_width="wrap_content"-->
+<!--		android:layout_height="wrap_content" android:id="@+id/AnswerWithVideo"-->
+<!--		android:text="answer with video"-->
+<!--		android:textAppearance="?android:attr/textAppearanceLarge"-->
+<!--		android:layout_alignParentLeft="true" android:layout_marginBottom="30sp"-->
+<!--		android:layout_above="@id/Answer"/>-->
+
+
+</RelativeLayout>
diff --git a/src/org/linphone/DialerActivity.java b/src/org/linphone/DialerActivity.java
index cf365e2a3..7a826da4c 100644
--- a/src/org/linphone/DialerActivity.java
+++ b/src/org/linphone/DialerActivity.java
@@ -27,7 +27,6 @@ import org.linphone.core.LinphoneCore;
 import org.linphone.core.Log;
 import org.linphone.core.LinphoneCall.State;
 import org.linphone.mediastream.Version;
-import org.linphone.mediastream.video.capture.hwconf.Hacks;
 import org.linphone.ui.AddVideoButton;
 import org.linphone.ui.AddressAware;
 import org.linphone.ui.AddressText;
@@ -93,6 +92,7 @@ public class DialerActivity extends LinphoneManagerWaitActivity implements Linph
 	private static final String CURRENT_DISPLAYNAME = "org.linphone.current-displayname";
 
 	private static final int incomingCallDialogId = 1;
+	private static final int INCOMING_CALL_ACTIVITY = 10;
 
 	/**
 	 * @return null if not ready yet
@@ -274,7 +274,8 @@ public class DialerActivity extends LinphoneManagerWaitActivity implements Linph
 	private void exitCallMode() {
 		// Remove dialog if existing
 		try {
-			dismissDialog(incomingCallDialogId);
+//			dismissDialog(incomingCallDialogId);
+			finishActivity(INCOMING_CALL_ACTIVITY);
 		} catch (Throwable e) {/* Exception if never created */}
 
 		if (useIncallActivity) {
@@ -307,7 +308,15 @@ public class DialerActivity extends LinphoneManagerWaitActivity implements Linph
 
 
 	private void callPending(final LinphoneCall call) {
-		showDialog(incomingCallDialogId);
+//		showDialog(incomingCallDialogId);
+		LinphoneAddress address = LinphoneManager.getLc().getRemoteAddress();
+		String from = LinphoneManager.extractADisplayName(getResources(), address);
+		Intent intent = new Intent()
+		.setClass(this, IncomingCallActivity.class)
+		.putExtra("name", from)
+		.putExtra("number", address.asStringUriOnly());
+		
+		startActivityForResult(intent, INCOMING_CALL_ACTIVITY);
 	}
 
 	@Override
diff --git a/src/org/linphone/IncomingCallActivity.java b/src/org/linphone/IncomingCallActivity.java
new file mode 100644
index 000000000..b4c3c1946
--- /dev/null
+++ b/src/org/linphone/IncomingCallActivity.java
@@ -0,0 +1,59 @@
+/*
+IncomingCallActivity.java
+Copyright (C) 2011  Belledonne Communications, Grenoble, France
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+package org.linphone;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.view.WindowManager;
+import android.widget.TextView;
+
+/**
+ * Activity displayed when a call comes in.
+ * It should bypass the screen lock mechanism.
+ *
+ * @author Guillaume Beraudo
+ */
+public class IncomingCallActivity extends Activity {
+
+	private TextView mNameView;
+	private TextView mNumberView;
+
+	
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		setContentView(R.layout.incoming);
+
+		mNameView = (TextView) findViewById(R.id.incoming_caller_name);
+		mNumberView = (TextView) findViewById(R.id.incoming_caller_number);
+
+		
+        // set this flag so this activity will stay in front of the keyguard
+        int flags = WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED;
+        flags |= WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD;
+        getWindow().addFlags(flags);
+	}
+
+	@Override
+	protected void onResume() {
+		mNameView.setText(getIntent().getStringExtra("name"));
+		mNumberView.setText(getIntent().getStringExtra("number"));
+		super.onResume();
+	}
+}

From 3ea4fdb5be628651066f0253c0fe8493a77277f5 Mon Sep 17 00:00:00 2001
From: Guillaume Beraudo <guillaume.beraudo@belledonne-communications.com>
Date: Tue, 27 Sep 2011 10:28:51 +0200
Subject: [PATCH 05/62] Conferencing: transfer and new call working.

---
 res/layout/simplified_dialer.xml              |  36 ++++
 res/layout/uri_picker.xml                     |  19 +++
 res/values/strings.xml                        |   5 +
 .../AbstractContactPickerActivity.java        |   2 +-
 src/org/linphone/ConferenceActivity.java      |  50 +++++-
 src/org/linphone/HistoryActivity.java         |   5 +-
 src/org/linphone/LinphoneActivity.java        |  11 +-
 src/org/linphone/UriPickerActivity.java       | 159 ++++++++++++++++++
 8 files changed, 271 insertions(+), 16 deletions(-)
 create mode 100644 res/layout/simplified_dialer.xml
 create mode 100644 res/layout/uri_picker.xml
 create mode 100644 src/org/linphone/UriPickerActivity.java

diff --git a/res/layout/simplified_dialer.xml b/res/layout/simplified_dialer.xml
new file mode 100644
index 000000000..1ffee31fa
--- /dev/null
+++ b/res/layout/simplified_dialer.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:linphone="http://schemas.android.com/apk/res/linphone"
+	android:orientation="vertical" android:layout_width="fill_parent"
+	android:layout_height="fill_parent">
+
+	<LinearLayout android:layout_height="wrap_content"
+		android:layout_width="fill_parent" android:id="@+id/Addresslayout">
+		<org.linphone.ui.AddressText android:id="@+id/SipUri"
+			android:background="@drawable/clavier_bg_grey" android:hint="sip:"
+			android:layout_width="fill_parent" android:lines="1"
+			android:layout_weight="0.2" android:layout_height="fill_parent"
+			android:padding="10px" android:maxLines="1" android:editable="@bool/allow_edit_in_dialer" />
+		<org.linphone.ui.EraseButton
+			android:layout_height="fill_parent" android:background="@drawable/clavier_bg"
+			android:id="@+id/Erase" android:layout_width="fill_parent"
+			android:layout_weight="0.8" android:textSize="20sp"
+			android:textStyle="bold" android:text="&lt;" android:layout_gravity="top"
+			android:textColor="@android:color/black" />
+	</LinearLayout>
+
+	<org.linphone.ui.Numpad android:id="@+id/Dialer"
+		android:layout_width="fill_parent" android:layout_height="fill_parent"
+		android:layout_weight="4" />
+
+	<LinearLayout android:gravity="bottom"
+		android:layout_height="wrap_content" android:layout_width="fill_parent">
+		<Button android:id="@+id/AddCallButton" android:text="@string/AddCallButtonText"
+			android:layout_height="fill_parent" android:layout_width="fill_parent"
+			android:layout_weight="1" android:background="@drawable/clavier_bg" />
+		<Button android:id="@+id/AddCallCancelButton" android:text="@string/CancelButtonText"
+			android:layout_height="fill_parent" android:layout_width="fill_parent"
+			android:layout_weight="1" android:background="@drawable/clavier_bg" />
+	</LinearLayout>
+
+</LinearLayout>
diff --git a/res/layout/uri_picker.xml b/res/layout/uri_picker.xml
new file mode 100644
index 000000000..be34db025
--- /dev/null
+++ b/res/layout/uri_picker.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:id="@+id/main_frame" android:layout_width="fill_parent"
+	android:layout_height="fill_parent">
+	<TabHost android:id="@android:id/tabhost" android:layout_width="fill_parent"
+		android:layout_height="fill_parent">
+		<LinearLayout android:orientation="vertical"
+			android:layout_width="fill_parent" android:layout_height="fill_parent">
+			<!--
+				android:padding="5dp"
+			-->
+			<TabWidget android:id="@android:id/tabs"
+				android:layout_width="fill_parent" android:layout_height="wrap_content" />
+			<FrameLayout android:id="@android:id/tabcontent"
+				android:layout_width="fill_parent" android:layout_height="fill_parent" />
+		</LinearLayout>
+
+	</TabHost>
+</FrameLayout>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 142bbf769..f96ab8ce1 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
+	<string name="uri_picking_canceled">Canceled</string>
+	<string name="error_adding_new_call">Error adding new call</string>
+	<string name="transfer_started">Transfer started</string>
+
+
 	<string name="status_conf_call">conf</string>
 	<string name="status_active_call">active</string>
 	<string name="state_paused">paused</string>
diff --git a/src/org/linphone/AbstractContactPickerActivity.java b/src/org/linphone/AbstractContactPickerActivity.java
index 6e8552480..ebc309679 100644
--- a/src/org/linphone/AbstractContactPickerActivity.java
+++ b/src/org/linphone/AbstractContactPickerActivity.java
@@ -155,7 +155,7 @@ public abstract class AbstractContactPickerActivity extends Activity implements
 			finish();
 		}*/
 
-		LinphoneActivity.setAddressAndGoToDialer(number, name, photo);
+		((ContactPicked) getParent()).setAddressAndGoToDialer(number, name, photo);
 	}
 
 	
diff --git a/src/org/linphone/ConferenceActivity.java b/src/org/linphone/ConferenceActivity.java
index 71e66add2..66e57acde 100644
--- a/src/org/linphone/ConferenceActivity.java
+++ b/src/org/linphone/ConferenceActivity.java
@@ -84,6 +84,8 @@ public class ConferenceActivity extends ListActivity implements
 	public static final String ADD_CALL = "add_call";
 	public static final String TRANSFER_TO_NEW_CALL = "transfer_to_new_call";
 	public static final String CALL_NATIVE_ID = "call_native_id";
+	private static final int ID_ADD_CALL = 1;
+	private static final int ID_TRANSFER_CALL = 2;
 
 
 	private void workaroundStatusBarBug() {
@@ -196,11 +198,10 @@ public class ConferenceActivity extends ListActivity implements
 			Toast.makeText(this,
 					"Should now finish this activity to go back to dialer",
 					Toast.LENGTH_LONG).show();
-			// startActivityForResult(new Intent().setClass(this,
-			// LinphoneContactSelectorActivity.class), 0);
+			Intent intent = new Intent().setClass(this, UriPickerActivity.class);
+			intent.putExtra(UriPickerActivity.EXTRA_PICKER_TYPE, UriPickerActivity.EXTRA_PICKER_TYPE_ADD);
+			startActivityForResult(intent, ID_ADD_CALL);
 			lc().pauseAllCalls();
-			setResult(RESULT_OK, new Intent().putExtra(ADD_CALL, true));
-			finish();
 			break;
 		case R.id.conf_header:
 			View content = getLayoutInflater().inflate(R.layout.conf_choices_admin, null);
@@ -304,9 +305,10 @@ public class ConferenceActivity extends ListActivity implements
 				break;
 			case R.id.transfer_new:
 				Toast.makeText(ConferenceActivity.this, "Transfer choice selected : to do, create activity to select new call", Toast.LENGTH_LONG).show();
-//				setResult(RESULT_OK, new Intent().putExtra(TRANSFER_TO_NEW_CALL, true));
-//				setResult(RESULT_OK, new Intent().putExtra(CALL_NATIVE_ID, Hacks.ptrOf(call)));
-//				finish();
+				Intent intent = new Intent().setClass(ConferenceActivity.this, UriPickerActivity.class);
+				intent.putExtra(UriPickerActivity.EXTRA_PICKER_TYPE, UriPickerActivity.EXTRA_PICKER_TYPE_TRANSFER);
+				callToTransfer = call;	
+				startActivityForResult(intent, ID_TRANSFER_CALL);
 				break;
 			case R.id.remove_from_conference:
 				lc().removeFromConference(call);
@@ -431,7 +433,8 @@ public class ConferenceActivity extends ListActivity implements
 			View removeFromConfButton = v.findViewById(R.id.remove_from_conference);
 			setVisibility(removeFromConfButton, false);
 			
-			setVisibility(v, R.id.addVideo, !showUnhook && linphoneCalls.size() == 1);
+			final int numberOfCalls = linphoneCalls.size();
+			setVisibility(v, R.id.addVideo, !showUnhook && numberOfCalls == 1);
 
 			boolean statusPaused = state== State.Paused || state == State.PausedByRemote;
 			setVisibility(v, R.id.callee_status_paused, statusPaused);
@@ -451,7 +454,7 @@ public class ConferenceActivity extends ListActivity implements
 					View content = getLayoutInflater().inflate(R.layout.conf_choices_dialog, null);
 					Dialog dialog = new AlertDialog.Builder(ConferenceActivity.this).setView(content).create();
 					OnClickListener l = new CallActionListener(call, dialog);
-					enableView(content, R.id.transfer_existing, l, !isInConference);
+					enableView(content, R.id.transfer_existing, l, !isInConference && numberOfCalls >=2);
 					enableView(content, R.id.transfer_new, l, !isInConference);
 					enableView(content, R.id.remove_from_conference, l, isInConference);
 					enableView(content, R.id.merge_to_conference, l, showMergeToConf);
@@ -536,6 +539,35 @@ public class ConferenceActivity extends ListActivity implements
 		return durationDiff;
 
 	}
+
+	private LinphoneCall callToTransfer;
+	@Override
+	protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+		if (resultCode != RESULT_OK) {
+			callToTransfer = null;
+			Toast.makeText(this, R.string.uri_picking_canceled, Toast.LENGTH_LONG).show();
+			return;
+		}
+
+		String uri = data.getStringExtra(UriPickerActivity.EXTRA_CALLEE_URI);
+		switch (requestCode) {
+		case ID_ADD_CALL:
+			try {
+				lc().invite(uri);
+			} catch (LinphoneCoreException e) {
+				Log.e(e);
+				Toast.makeText(this, R.string.error_adding_new_call, Toast.LENGTH_LONG).show();
+			}
+			break;
+		case ID_TRANSFER_CALL:
+			lc().transferCall(callToTransfer, uri);
+			Toast.makeText(this, R.string.transfer_started, Toast.LENGTH_LONG).show();
+			break;
+		default:
+			throw new RuntimeException("unhandled request code " + requestCode);
+		}
+	}
+	
 	/*
 	 * public int compare(LinphoneCall c1, LinphoneCall c2) { if (c1 == c2)
 	 * return 0;
diff --git a/src/org/linphone/HistoryActivity.java b/src/org/linphone/HistoryActivity.java
index 4d0bd2ef5..4381a7515 100644
--- a/src/org/linphone/HistoryActivity.java
+++ b/src/org/linphone/HistoryActivity.java
@@ -57,11 +57,12 @@ public class HistoryActivity extends ListActivity {
 		super.onListItemClick(l, v, position, id);
 		TextView lFirstLineView = (TextView) v.findViewById(R.id.history_cell_first_line);
 		TextView lSecondLineView = (TextView) v.findViewById(R.id.history_cell_second_line);
+		ContactPicked parent = (ContactPicked) getParent();
 		if (lSecondLineView.getVisibility() == View.GONE) {
 			// no display name
-			LinphoneActivity.setAddressAndGoToDialer(lFirstLineView.getText().toString(), null, null);
+			parent.setAddressAndGoToDialer(lFirstLineView.getText().toString(), null, null);
 		} else {
-			LinphoneActivity.setAddressAndGoToDialer(
+			parent.setAddressAndGoToDialer(
 					lSecondLineView.getText().toString(),
 					lFirstLineView.getText().toString(),
 					null);
diff --git a/src/org/linphone/LinphoneActivity.java b/src/org/linphone/LinphoneActivity.java
index b237c9925..80af1ed5e 100644
--- a/src/org/linphone/LinphoneActivity.java
+++ b/src/org/linphone/LinphoneActivity.java
@@ -1,5 +1,5 @@
 /*
-iLinphoneActivity.java
+LinphoneActivity.java
 Copyright (C) 2010  Belledonne Communications, Grenoble, France
 
 This program is free software; you can redistribute it and/or
@@ -60,7 +60,7 @@ import android.widget.TextView;
 import android.widget.Toast;
 import android.widget.TabHost.TabSpec;
 	
-public class LinphoneActivity extends TabActivity implements SensorEventListener {
+public class LinphoneActivity extends TabActivity implements SensorEventListener, ContactPicked {
 	public static final String DIALER_TAB = "dialer";
     public static final String PREF_FIRST_LAUNCH = "pref_first_launch";
     private static final int video_activity = 100;
@@ -478,7 +478,7 @@ public class LinphoneActivity extends TabActivity implements SensorEventListener
 		builder.create().show();
 	}
 
-	static void setAddressAndGoToDialer(String number, String name, Uri photo) {
+	public void setAddressAndGoToDialer(String number, String name, Uri photo) {
 		DialerActivity.instance().setContactAddress(number, name, photo);
 		instance.gotToDialer();
 	}
@@ -542,5 +542,8 @@ public class LinphoneActivity extends TabActivity implements SensorEventListener
 			}
 		});
 	}
-
 }
+
+interface ContactPicked {
+	void setAddressAndGoToDialer(String number, String name, Uri photo);
+}
\ No newline at end of file
diff --git a/src/org/linphone/UriPickerActivity.java b/src/org/linphone/UriPickerActivity.java
new file mode 100644
index 000000000..1edda8289
--- /dev/null
+++ b/src/org/linphone/UriPickerActivity.java
@@ -0,0 +1,159 @@
+/*
+LinphoneActivity.java
+Copyright (C) 2010  Belledonne Communications, Grenoble, France
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+package org.linphone;
+
+
+import org.linphone.mediastream.Version;
+import org.linphone.ui.AddressText;
+
+import android.app.Activity;
+import android.app.TabActivity;
+import android.content.Intent;
+import android.graphics.drawable.Drawable;
+import android.net.Uri;
+import android.os.Bundle;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.Button;
+import android.widget.TabWidget;
+import android.widget.TabHost.TabSpec;
+
+/**
+ * @author Guillaume Beraudo
+ */
+public class UriPickerActivity extends TabActivity implements ContactPicked {
+	private static final String DIALER_TAB = "dialer";
+	public static final String EXTRA_CALLEE_NAME = "callee_name";
+	public static final String EXTRA_CALLEE_URI = "callee_uri";
+	public static final String EXTRA_CALLEE_PHOTO_URI = "callee_photo_uri";
+	public static final String EXTRA_PICKER_TYPE = "picker_type";
+	public static final String EXTRA_PICKER_TYPE_ADD = "picker_type_add";
+	public static final String EXTRA_PICKER_TYPE_TRANSFER = "picker_type_transfer";
+
+	public void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		setContentView(R.layout.main);
+		fillTabHost();
+	}
+
+
+	private synchronized void fillTabHost() {
+		if (((TabWidget) findViewById(android.R.id.tabs)).getChildCount() != 0) return;
+
+		startActivityInTab("history",
+				new Intent().setClass(this, HistoryActivity.class),
+				R.string.tab_history, R.drawable.history_orange);
+
+
+		startActivityInTab(DIALER_TAB,
+				new Intent().setClass(this, DialerActivity.class).setData(getIntent().getData())
+				.putExtra(EXTRA_PICKER_TYPE, getIntent().getStringExtra(EXTRA_PICKER_TYPE)),
+				R.string.tab_dialer, R.drawable.dialer_orange);
+
+
+		startActivityInTab("contact",
+				new Intent().setClass(this, Version.sdkAboveOrEqual(5) ?
+						ContactPickerActivityNew.class : ContactPickerActivityOld.class),
+						R.string.tab_contact, R.drawable.contact_orange);
+
+
+		gotToDialer();
+	}
+
+
+	private void gotToDialer() {
+		getTabHost().setCurrentTabByTag(DIALER_TAB);
+	}
+
+	private void startActivityInTab(String tag, Intent intent, int indicatorId, int drawableId) {
+		Drawable tabDrawable = getResources().getDrawable(drawableId);
+		TabSpec spec = getTabHost().newTabSpec(tag)
+		.setIndicator(getString(indicatorId), tabDrawable)
+		.setContent(intent);
+		getTabHost().addTab(spec);
+	}
+
+
+	
+	void terminate(String number, String name, Uri photo) {
+		Intent intent = new Intent()
+		.putExtra(EXTRA_CALLEE_NAME, name)
+		.putExtra(EXTRA_CALLEE_URI, number)
+		.putExtra(EXTRA_CALLEE_PHOTO_URI, photo);
+		setResult(Activity.RESULT_OK, intent);
+		finish();
+	}
+
+	
+	
+	
+	
+	public static class DialerActivity extends Activity implements OnClickListener {
+
+		private AddressText mAddress;
+		private Button addButton;
+
+		@Override
+		protected void onCreate(Bundle savedInstanceState) {
+			setContentView(R.layout.simplified_dialer);
+			mAddress = (AddressText) findViewById(R.id.SipUri);
+
+			addButton = (Button) findViewById(R.id.AddCallButton);
+			addButton.setOnClickListener(this);
+			String type = getIntent().getStringExtra(EXTRA_PICKER_TYPE);
+			if (EXTRA_PICKER_TYPE_ADD.equals(type)) {
+				addButton.setText(getString(R.string.AddCallButtonText));
+			} else if (EXTRA_PICKER_TYPE_TRANSFER.equals(type)) {
+				addButton.setText(getString(R.string.TransferCallButtonText));
+			} else {
+				throw new RuntimeException("unknown type");
+			}
+
+			findViewById(R.id.AddCallCancelButton).setOnClickListener(this);
+
+			super.onCreate(savedInstanceState);
+		}
+
+		public void setContactAddress(String number, String name, Uri photo) {
+			mAddress.setText(number);
+			mAddress.setDisplayedName(name);
+			mAddress.setPictureUri(photo);
+		}
+
+		@Override
+		public void onClick(View v) {
+			if (v == addButton) {
+			UriPickerActivity parent = (UriPickerActivity) getParent();
+			parent.terminate(mAddress.getText().toString(), mAddress.getDisplayedName(), mAddress.getPictureUri());
+			} else {
+				// propagate finish to parent through finishFromChild
+				finish();
+			}
+		}
+	}
+
+
+	public void setAddressAndGoToDialer(String number, String name, Uri photo) {
+		DialerActivity dialer = (DialerActivity) getLocalActivityManager().getActivity(DIALER_TAB);
+		dialer.setContactAddress(number, name, photo);
+		gotToDialer();
+	}
+
+
+}

From ebe078c70e764a1b27594df812c166785e1f2e32 Mon Sep 17 00:00:00 2001
From: Guillaume Beraudo <guillaume.beraudo@belledonne-communications.com>
Date: Tue, 27 Sep 2011 11:59:05 +0200
Subject: [PATCH 06/62] Finish incoming call activity on action. Terminate call
 on back and home.

---
 res/layout/incoming.xml                    | 10 +++---
 src/org/linphone/IncomingCallActivity.java | 38 ++++++++++++++++++++--
 2 files changed, 41 insertions(+), 7 deletions(-)

diff --git a/res/layout/incoming.xml b/res/layout/incoming.xml
index 16ffcc4d3..91e53bbdd 100644
--- a/res/layout/incoming.xml
+++ b/res/layout/incoming.xml
@@ -28,15 +28,17 @@
 	</LinearLayout>
 
 
-	<org.linphone.ui.CallButton  android:src="@drawable/startcall_green" android:layout_width="wrap_content"
-		android:layout_height="wrap_content" android:id="@+id/Answer"
+	<org.linphone.ui.CallButton android:id="@+id/Answer"
+		android:src="@drawable/startcall_green" android:layout_width="wrap_content"
+		android:layout_height="wrap_content" 
 		android:text="answer"
 		android:textAppearance="?android:attr/textAppearanceLarge"
 		android:layout_alignParentLeft="true" android:layout_marginBottom="40sp"
 		android:layout_alignParentBottom="true"/>
 
-	<org.linphone.ui.HangCallButton android:src="@drawable/stopcall_red" android:layout_width="wrap_content"
-		android:layout_height="wrap_content" android:id="@+id/Decline"
+	<org.linphone.ui.HangCallButton android:id="@+id/Decline"
+		android:src="@drawable/stopcall_red" android:layout_width="wrap_content"
+		android:layout_height="wrap_content" 
 		android:text="decline" 
 		android:textAppearance="?android:attr/textAppearanceLarge"
 		android:layout_alignParentRight="true" android:layout_alignBottom="@id/Answer"/>
diff --git a/src/org/linphone/IncomingCallActivity.java b/src/org/linphone/IncomingCallActivity.java
index b4c3c1946..442be6247 100644
--- a/src/org/linphone/IncomingCallActivity.java
+++ b/src/org/linphone/IncomingCallActivity.java
@@ -18,9 +18,18 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 package org.linphone;
 
+import org.linphone.core.LinphoneAddress;
+import org.linphone.core.LinphoneCall;
+import org.linphone.core.LinphoneCore;
+import org.linphone.ui.CallButton;
+import org.linphone.ui.HangCallButton;
+
 import android.app.Activity;
 import android.os.Bundle;
+import android.view.KeyEvent;
+import android.view.View;
 import android.view.WindowManager;
+import android.view.View.OnClickListener;
 import android.widget.TextView;
 
 /**
@@ -29,20 +38,28 @@ import android.widget.TextView;
  *
  * @author Guillaume Beraudo
  */
-public class IncomingCallActivity extends Activity {
+public class IncomingCallActivity extends Activity implements OnClickListener {
 
 	private TextView mNameView;
 	private TextView mNumberView;
+	private LinphoneCall mCall;
 
 	
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
+		LinphoneCore lc = LinphoneManager.getLc();
+		mCall = lc.getCurrentCall();
+
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.incoming);
 
 		mNameView = (TextView) findViewById(R.id.incoming_caller_name);
 		mNumberView = (TextView) findViewById(R.id.incoming_caller_number);
 
+		HangCallButton hang = (HangCallButton) findViewById(R.id.Decline);
+		CallButton accept = (CallButton) findViewById(R.id.Answer);
+		hang.setExternalClickListener(this);
+		accept.setExternalClickListener(this);
 		
         // set this flag so this activity will stay in front of the keyguard
         int flags = WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED;
@@ -52,8 +69,23 @@ public class IncomingCallActivity extends Activity {
 
 	@Override
 	protected void onResume() {
-		mNameView.setText(getIntent().getStringExtra("name"));
-		mNumberView.setText(getIntent().getStringExtra("number"));
+		LinphoneAddress address = mCall.getRemoteAddress();
+		String from = LinphoneManager.extractADisplayName(getResources(), address);
+		mNameView.setText(from);
+		mNumberView.setText(address.asStringUriOnly());
 		super.onResume();
 	}
+
+	@Override
+	public boolean onKeyDown(int keyCode, KeyEvent event) {
+		if (keyCode == KeyEvent.KEYCODE_BACK || keyCode == KeyEvent.KEYCODE_HOME) {
+			LinphoneManager.getLc().terminateCall(mCall);
+		}
+		return super.onKeyDown(keyCode, event);
+	}
+
+	@Override
+	public void onClick(View v) {
+		finish();
+	}
 }

From da73120458d93f140090ad90a7c287b5168cfe78 Mon Sep 17 00:00:00 2001
From: Guillaume Beraudo <guillaume.beraudo@belledonne-communications.com>
Date: Tue, 27 Sep 2011 12:02:01 +0200
Subject: [PATCH 07/62] Plug mic and speaker toggle buttons in conferencing
 activity.

---
 src/org/linphone/ConferenceActivity.java | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/src/org/linphone/ConferenceActivity.java b/src/org/linphone/ConferenceActivity.java
index 66e57acde..8b5075c5e 100644
--- a/src/org/linphone/ConferenceActivity.java
+++ b/src/org/linphone/ConferenceActivity.java
@@ -51,6 +51,7 @@ import android.widget.BaseAdapter;
 import android.widget.ListAdapter;
 import android.widget.TextView;
 import android.widget.Toast;
+import android.widget.ToggleButton;
 
 /**
  * @author Guillaume Beraudo
@@ -94,6 +95,12 @@ public class ConferenceActivity extends ListActivity implements
 				WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS);
 	}
 
+	private void pauseCurrentCallOrLeaveConference() {
+		LinphoneCall call = lc().getCurrentCall();
+		if (call != null) lc().pauseCall(call);
+		lc().leaveConference();
+	}
+
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		setContentView(R.layout.conferencing);
@@ -108,6 +115,9 @@ public class ConferenceActivity extends ListActivity implements
 		findViewById(R.id.incallNumpadShow).setOnClickListener(this);
 		findViewById(R.id.conf_simple_merge).setOnClickListener(this);
 
+		findViewById(R.id.toggleMuteMic).setOnClickListener(this);
+		findViewById(R.id.toggleSpeaker).setOnClickListener(this);
+
 		List<LinphoneCall> calls = getInitialCalls();
 		setListAdapter(new CalleeListAdapter(calls));
 		workaroundStatusBarBug();
@@ -201,7 +211,7 @@ public class ConferenceActivity extends ListActivity implements
 			Intent intent = new Intent().setClass(this, UriPickerActivity.class);
 			intent.putExtra(UriPickerActivity.EXTRA_PICKER_TYPE, UriPickerActivity.EXTRA_PICKER_TYPE_ADD);
 			startActivityForResult(intent, ID_ADD_CALL);
-			lc().pauseAllCalls();
+			pauseCurrentCallOrLeaveConference();
 			break;
 		case R.id.conf_header:
 			View content = getLayoutInflater().inflate(R.layout.conf_choices_admin, null);
@@ -247,6 +257,16 @@ public class ConferenceActivity extends ListActivity implements
 		case R.id.conf_simple_merge:
 			lc().addAllToConference();
 			break;
+		case R.id.toggleMuteMic:
+			lc().muteMic(((ToggleButton) v).isChecked());
+			break;
+		case R.id.toggleSpeaker:
+			if (((ToggleButton) v).isChecked()) {
+				LinphoneManager.getInstance().routeAudioToSpeaker();
+			} else {
+				LinphoneManager.getInstance().routeAudioToReceiver();
+			}
+			break;
 		default:
 			break;
 		}

From 0acbc5c65a15b899b83331c3fbc2210ddb20a781 Mon Sep 17 00:00:00 2001
From: Guillaume Beraudo <guillaume.beraudo@belledonne-communications.com>
Date: Tue, 27 Sep 2011 14:03:16 +0200
Subject: [PATCH 08/62] Customization: incoming call, incall/conference

---
 res/layout-land/dialer.xml               | 11 ---
 res/layout/dialer.xml                    | 10 ---
 res/values/custom.xml                    |  5 +-
 src/org/linphone/ConferenceActivity.java |  4 +-
 src/org/linphone/DialerActivity.java     | 98 +++++++-----------------
 src/org/linphone/IncallActivity.java     |  4 +
 src/org/linphone/LinphoneActivity.java   | 24 ++----
 7 files changed, 44 insertions(+), 112 deletions(-)

diff --git a/res/layout-land/dialer.xml b/res/layout-land/dialer.xml
index 2ec2197f3..b18e0dd33 100644
--- a/res/layout-land/dialer.xml
+++ b/res/layout-land/dialer.xml
@@ -51,17 +51,6 @@
 			<org.linphone.ui.HangCallButton android:id="@+id/HangUp" android:layout_height="fill_parent" android:layout_width="fill_parent" android:layout_weight="1" android:src="@drawable/stopcall_red" android:background="@drawable/clavier_bg"/>
 		</LinearLayout>
 
-		<LinearLayout android:id="@+id/AddCallControlRow" android:layout_height="wrap_content" android:layout_width="fill_parent" android:gravity="bottom" android:visibility="gone">
-			<Button android:id="@+id/AddCallButton" android:text="@string/AddCallButtonText" android:layout_height="fill_parent" android:layout_width="fill_parent" android:layout_weight="1" android:background="@drawable/clavier_bg"/>
-			<Button android:id="@+id/AddCallCancelButton" android:text="@string/CancelButtonText" android:layout_height="fill_parent" android:layout_width="fill_parent" android:layout_weight="1" android:background="@drawable/clavier_bg"/>
-		</LinearLayout>
-
-		<LinearLayout android:id="@+id/transferCallControlRow" android:layout_height="wrap_content" android:layout_width="fill_parent" android:gravity="bottom" android:visibility="gone">
-			<Button android:id="@+id/TransferCallButton" android:text="@string/TransferCallButtonText" android:layout_height="fill_parent" android:layout_width="fill_parent" android:layout_weight="1" android:background="@drawable/clavier_bg"/>
-			<Button android:id="@+id/TransferCallCancelButton" android:text="@string/CancelButtonText" android:layout_height="fill_parent" android:layout_width="fill_parent" android:layout_weight="1" android:background="@drawable/clavier_bg"/>
-		</LinearLayout>
-
-
 		<EditText android:id="@+id/status_label" android:layout_width="fill_parent" 
 			android:clickable="false" android:focusable="false"
 			android:cursorVisible="false" android:textSize="12sp" android:height="15sp"
diff --git a/res/layout/dialer.xml b/res/layout/dialer.xml
index 9a8c74b03..a5b8ed433 100644
--- a/res/layout/dialer.xml
+++ b/res/layout/dialer.xml
@@ -48,16 +48,6 @@
 			<org.linphone.ui.HangCallButton android:id="@+id/HangUp" android:src="@drawable/stopcall_red" android:layout_height="fill_parent" android:layout_width="fill_parent" android:layout_weight="0.25" android:background="@drawable/clavier_bg"/>
 		</LinearLayout>
 
-		<LinearLayout android:id="@+id/AddCallControlRow" android:layout_height="wrap_content" android:layout_width="fill_parent" android:gravity="bottom" android:visibility="gone">
-			<Button android:id="@+id/AddCallButton" android:text="@string/AddCallButtonText" android:layout_height="fill_parent" android:layout_width="fill_parent" android:layout_weight="1" android:background="@drawable/clavier_bg"/>
-			<Button android:id="@+id/AddCallCancelButton" android:text="@string/CancelButtonText" android:layout_height="fill_parent" android:layout_width="fill_parent" android:layout_weight="1" android:background="@drawable/clavier_bg"/>
-		</LinearLayout>
-
-		<LinearLayout android:id="@+id/transferCallControlRow" android:layout_height="wrap_content" android:layout_width="fill_parent" android:gravity="bottom" android:visibility="gone">
-			<Button android:id="@+id/TransferCallButton" android:text="@string/TransferCallButtonText" android:layout_height="fill_parent" android:layout_width="fill_parent" android:layout_weight="1" android:background="@drawable/clavier_bg"/>
-			<Button android:id="@+id/TransferCallCancelButton" android:text="@string/CancelButtonText" android:layout_height="fill_parent" android:layout_width="fill_parent" android:layout_weight="1" android:background="@drawable/clavier_bg"/>
-		</LinearLayout>
-
 		<EditText android:id="@+id/status_label" android:clickable="false" android:focusable="false" android:cursorVisible="false" android:textSize="12sp" android:height="15sp" android:layout_height="wrap_content" android:layout_width="fill_parent" android:background="@android:color/transparent" android:textColor="@android:color/white" />
 	</LinearLayout>
 
diff --git a/res/values/custom.xml b/res/values/custom.xml
index 3489ab466..9802a3127 100644
--- a/res/values/custom.xml
+++ b/res/values/custom.xml
@@ -10,8 +10,11 @@
     <bool name="useFirstLoginActivity">false</bool>
 	<bool name="useMenuSettings">true</bool>
 	<bool name="useMenuAbout">true</bool>
-	<bool name="use_incall_activity">true</bool>
+	<bool name="use_incall_activity">false</bool>
+	<bool name="use_conference_activity">true</bool>
 	<bool name="use_video_activity">true</bool>
+	<bool name="use_incoming_call_dialog">false</bool>
+	<bool name="use_incoming_call_activity">true</bool>
 	<bool name="show_full_remote_address_on_incoming_call">true</bool>
 
 	<string name="notification_title">Linphone</string>
diff --git a/src/org/linphone/ConferenceActivity.java b/src/org/linphone/ConferenceActivity.java
index 8b5075c5e..f201b2d7b 100644
--- a/src/org/linphone/ConferenceActivity.java
+++ b/src/org/linphone/ConferenceActivity.java
@@ -298,8 +298,6 @@ public class ConferenceActivity extends ListActivity implements
 				lc().resumeCall(call);
 				break;
 			case R.id.unhook_call:
-				LinphoneCall currentCall = lc().getCurrentCall();
-				if (currentCall != null) lc().pauseCall(currentCall);
 				try {
 					lc().acceptCall(call);
 				} catch (LinphoneCoreException e) {
@@ -454,7 +452,7 @@ public class ConferenceActivity extends ListActivity implements
 			setVisibility(removeFromConfButton, false);
 			
 			final int numberOfCalls = linphoneCalls.size();
-			setVisibility(v, R.id.addVideo, !showUnhook && numberOfCalls == 1);
+			setVisibility(v, R.id.addVideo, !isInConference && !showUnhook && numberOfCalls == 1);
 
 			boolean statusPaused = state== State.Paused || state == State.PausedByRemote;
 			setVisibility(v, R.id.callee_status_paused, statusPaused);
diff --git a/src/org/linphone/DialerActivity.java b/src/org/linphone/DialerActivity.java
index 7a826da4c..50a6b6910 100644
--- a/src/org/linphone/DialerActivity.java
+++ b/src/org/linphone/DialerActivity.java
@@ -47,7 +47,6 @@ import android.os.Bundle;
 import android.os.PowerManager;
 import android.preference.PreferenceManager;
 import android.view.View;
-import android.view.ViewGroup;
 import android.view.View.OnClickListener;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -87,6 +86,7 @@ public class DialerActivity extends LinphoneManagerWaitActivity implements Linph
 	private LinphoneCall mCurrentCall;
 	private boolean useIncallActivity;
 	private boolean useVideoActivity;
+	private boolean useConferenceActivity;
 	
 	private static final String CURRENT_ADDRESS = "org.linphone.current-address"; 
 	private static final String CURRENT_DISPLAYNAME = "org.linphone.current-displayname";
@@ -107,6 +107,7 @@ public class DialerActivity extends LinphoneManagerWaitActivity implements Linph
 		setContentView(R.layout.dialer);
 
 		useIncallActivity = getResources().getBoolean(R.bool.use_incall_activity);
+		useConferenceActivity = getResources().getBoolean(R.bool.use_conference_activity);
 		useVideoActivity = getResources().getBoolean(R.bool.use_video_activity);
 		// Don't use Linphone Manager in the onCreate as it takes time in LinphoneService to initialize it.
 
@@ -231,8 +232,9 @@ public class DialerActivity extends LinphoneManagerWaitActivity implements Linph
 		if (!mWakeLock.isHeld()) mWakeLock.acquire();
 		
 		if (useIncallActivity) {
-//			LinphoneActivity.instance().startIncallActivity(
-//				mDisplayNameView.getText(), mAddress.getPictureUri());
+			LinphoneActivity.instance().startIncallActivity(
+				mDisplayNameView.getText(), mAddress.getPictureUri());
+		} else if (useConferenceActivity) {
 			LinphoneActivity.instance().startConferenceActivity();
 		} else {
 			loadMicAndSpeakerUiStateFromManager();
@@ -249,7 +251,8 @@ public class DialerActivity extends LinphoneManagerWaitActivity implements Linph
 	
 
 	private void updateIncallVideoCallButton() {
-		if (useIncallActivity) throw new RuntimeException("Internal error");
+		if (useIncallActivity || useConferenceActivity)
+			throw new RuntimeException("Internal error");
 
 		boolean prefVideoEnabled = LinphoneManager.getInstance().isVideoEnabled();
 		AddVideoButton mAddVideo = (AddVideoButton) findViewById(R.id.AddVideo);
@@ -264,7 +267,8 @@ public class DialerActivity extends LinphoneManagerWaitActivity implements Linph
 
 
 	private void loadMicAndSpeakerUiStateFromManager() {
-		if (useIncallActivity) throw new RuntimeException("Internal error"); // only dialer widgets are updated with this
+		if (useIncallActivity || useConferenceActivity)
+			throw new RuntimeException("Internal error"); // only dialer widgets are updated with this
 
 		mMute.setChecked(LinphoneManager.getLc().isMicMuted());
 		mSpeaker.setSpeakerOn(LinphoneManager.getInstance().isSpeakerOn());
@@ -272,15 +276,21 @@ public class DialerActivity extends LinphoneManagerWaitActivity implements Linph
 	
 	
 	private void exitCallMode() {
-		// Remove dialog if existing
-		try {
-//			dismissDialog(incomingCallDialogId);
+		if (getResources().getBoolean(R.bool.use_incoming_call_activity)) {
 			finishActivity(INCOMING_CALL_ACTIVITY);
-		} catch (Throwable e) {/* Exception if never created */}
+		} else if (getResources().getBoolean(R.bool.use_incoming_call_dialog)) {
+			// Remove dialog if existing
+			try {
+				dismissDialog(incomingCallDialogId);
+			} catch (Throwable e) {/* Exception if never created */}
+		}
+		
 
 		if (useIncallActivity) {
 			LinphoneActivity.instance().closeIncallActivity();
-		} else {
+		} else if(useConferenceActivity) { 
+			LinphoneActivity.instance().closeConferenceActivity();
+		}else {
 			mCallControlRow.setVisibility(View.VISIBLE);
 			mInCallControlRow.setVisibility(View.GONE);
 			mInCallAddressLayout.setVisibility(View.GONE);
@@ -308,15 +318,12 @@ public class DialerActivity extends LinphoneManagerWaitActivity implements Linph
 
 
 	private void callPending(final LinphoneCall call) {
-//		showDialog(incomingCallDialogId);
-		LinphoneAddress address = LinphoneManager.getLc().getRemoteAddress();
-		String from = LinphoneManager.extractADisplayName(getResources(), address);
-		Intent intent = new Intent()
-		.setClass(this, IncomingCallActivity.class)
-		.putExtra("name", from)
-		.putExtra("number", address.asStringUriOnly());
-		
-		startActivityForResult(intent, INCOMING_CALL_ACTIVITY);
+		if (getResources().getBoolean(R.bool.use_incoming_call_activity)) {
+			Intent intent = new Intent().setClass(this, IncomingCallActivity.class);
+			startActivityForResult(intent, INCOMING_CALL_ACTIVITY);
+		} else if (getResources().getBoolean(R.bool.use_incoming_call_dialog)) {
+			showDialog(incomingCallDialogId);
+		}
 	}
 
 	@Override
@@ -470,7 +477,7 @@ public class DialerActivity extends LinphoneManagerWaitActivity implements Linph
 
 	public void onGlobalStateChangedToOn(String message) {
 		mCall.setEnabled(!LinphoneManager.getLc().isIncall());
-		if (!useIncallActivity) updateIncallVideoCallButton();
+		if (!useIncallActivity && !useConferenceActivity) updateIncallVideoCallButton();
 		else mHangup.setEnabled(!mCall.isEnabled());  
 
 		if (getIntent().getData() != null) {
@@ -503,55 +510,4 @@ public class DialerActivity extends LinphoneManagerWaitActivity implements Linph
 		super.onResume();
 	}
 
-
-	private void switchControlRow(ViewGroup v, OnClickListener l) {
-		final View ok = v.getChildAt(0);
-		final View cancel = v.getChildAt(1);
-		ok.setOnClickListener(l);
-		cancel.setOnClickListener(l);
-		findViewById(R.id.IncallControlRow).setVisibility(View.GONE);
-		findViewById(R.id.CallControlRow).setVisibility(View.GONE);
-		v.setVisibility(View.VISIBLE);
-	}
-	public void configureForAddingCall() {
-		ViewGroup v = (ViewGroup) findViewById(R.id.AddCallControlRow);
-		OnClickListener l = new OnClickListener() {
-			public void onClick(View v) {
-				ViewGroup group = (ViewGroup) v.getParent();
-				if (v == group.getChildAt(1)) {
-					LinphoneActivity.instance().startConferenceActivity();
-				} else {
-					LinphoneManager.getInstance().newOutgoingCall(mAddress);
-				}
-			}
-		};
-		switchControlRow(v, l);
-	}
-
-
-	public void configureForTransferingCall(final long callNativeId) {
-		throw new RuntimeException("create another activity for this");
-//		ViewGroup v = (ViewGroup) findViewById(R.id.transferCallControlRow);
-//		OnClickListener l = new OnClickListener() {
-//			public void onClick(View v) {
-//				ViewGroup group = (ViewGroup) v.getParent();
-//				if (v == group.getChildAt(1)) {
-//					LinphoneActivity.instance().startConferenceActivity();
-//				} else {
-//					LinphoneManager.getLc().transferCall(Hacks.createCall(callNativeId),
-//							mAddress.getText().toString());
-//				}
-//			}
-//		};
-//		switchControlRow(v, l);
-	}
-
-
-	public void configureForDialer() {
-		findViewById(R.id.AddCallControlRow).setVisibility(R.id.transferCallControlRow);
-		findViewById(R.id.AddCallControlRow).setVisibility(View.GONE);
-		findViewById(R.id.IncallControlRow).setVisibility(View.GONE);
-		findViewById(R.id.CallControlRow).setVisibility(View.VISIBLE);
-	}
-	
 }
diff --git a/src/org/linphone/IncallActivity.java b/src/org/linphone/IncallActivity.java
index e108d5c1f..734a7aa70 100644
--- a/src/org/linphone/IncallActivity.java
+++ b/src/org/linphone/IncallActivity.java
@@ -32,6 +32,10 @@ import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.TextView;
 
+/**
+ * @author Guillaume Beraudo
+ *
+ */
 public class IncallActivity extends SoftVolumeActivity implements OnClickListener {
 
 	public static final String CONTACT_KEY = "contact";
diff --git a/src/org/linphone/LinphoneActivity.java b/src/org/linphone/LinphoneActivity.java
index 80af1ed5e..3f30cfda6 100644
--- a/src/org/linphone/LinphoneActivity.java
+++ b/src/org/linphone/LinphoneActivity.java
@@ -174,17 +174,6 @@ public class LinphoneActivity extends TabActivity implements SensorEventListener
 			}
 			break;
 		case conference_activity:
-			if (data == null) {
-				DialerActivity.instance().configureForDialer();
-			} else if (data.getBooleanExtra(ConferenceActivity.ADD_CALL, false)) {
-				DialerActivity.instance().configureForAddingCall();
-				gotToDialer();
-			} else if (data.getBooleanExtra(ConferenceActivity.TRANSFER_TO_NEW_CALL, false)) {
-				long callId = data.getLongExtra(ConferenceActivity.CALL_NATIVE_ID, 0l);
-				if (callId == 0) throw new RuntimeException("call id is 0");
-				DialerActivity.instance().configureForTransferingCall(callId);
-				gotToDialer();
-			}
 			break;
 		default:
 			break;
@@ -236,7 +225,9 @@ public class LinphoneActivity extends TabActivity implements SensorEventListener
 			} else {
 				if (getResources().getBoolean(R.bool.use_incall_activity)) {
 					LinphoneAddress address = LinphoneManager.getLc().getRemoteAddress();
-					startIncallActivity(LinphoneManager.getInstance().extractADisplayName(getResources(), address), null);
+					startIncallActivity(LinphoneManager.extractADisplayName(getResources(), address), null);
+				} if (getResources().getBoolean(R.bool.use_conference_activity)) {
+					startConferenceActivity();
 				} else {
 					// TODO
 					Log.e("Not handled case: recreation while in call and not using incall activity");
@@ -497,18 +488,19 @@ public class LinphoneActivity extends TabActivity implements SensorEventListener
 	}
 
 	public void startIncallActivity(CharSequence callerName, Uri pictureUri) {
-/*		Intent intent = new Intent().setClass(this, IncallActivity.class)
+		Intent intent = new Intent().setClass(this, IncallActivity.class)
                                 .putExtra(IncallActivity.CONTACT_KEY, callerName);
 		if (pictureUri != null)
 			intent.putExtra(IncallActivity.PICTURE_URI_KEY, pictureUri.toString());
-		startActivityForResult(intent, INCALL_ACTIVITY);*/
-		// Hacked
-		startConferenceActivity();
+		startActivityForResult(intent, INCALL_ACTIVITY);
 	}
 
 	public void closeIncallActivity() {
 		finishActivity(INCALL_ACTIVITY);
 	}
+	public void closeConferenceActivity() {
+		finishActivity(conference_activity);
+	}
 
 	public void startVideoActivity() {
 		mHandler.post(new Runnable() {

From b52433c3c3425e794378c0428be906904c63ce40 Mon Sep 17 00:00:00 2001
From: Guillaume Beraudo <guillaume.beraudo@belledonne-communications.com>
Date: Thu, 29 Sep 2011 16:36:40 +0200
Subject: [PATCH 09/62] improved incoming activity  + back to conference
 button.

---
 AndroidManifest.xml                         |   6 +--
 res/drawable/resume_blue.png                | Bin 0 -> 2927 bytes
 res/layout-land/dialer.xml                  |   1 +
 res/layout/dialer.xml                       |   9 ++--
 res/layout/incoming.xml                     |   4 +-
 res/values/strings.xml                      |   3 ++
 src/org/linphone/ConferenceActivity.java    |  20 +++++----
 src/org/linphone/DialerActivity.java        |  45 +++++++++++++++++++-
 src/org/linphone/IncomingCallActivity.java  |  45 +++++++++++++++-----
 src/org/linphone/LinphoneActivity.java      |   4 +-
 src/org/linphone/LinphoneManager.java       |  34 +++++++++++++--
 src/org/linphone/core/LinphoneCallImpl.java |  12 ++++++
 12 files changed, 150 insertions(+), 33 deletions(-)
 create mode 100644 res/drawable/resume_blue.png

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 5286ed535..2228c435e 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -36,8 +36,9 @@
 			 </intent-filter>
         </activity>
 
-
-        <activity android:name="org.linphone.IncomingCallActivity" android:theme="@android:style/Theme.NoTitleBar.Fullscreen">
+        <activity android:name="org.linphone.IncomingCallActivity"
+			android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
+			android:launchMode="singleInstance">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
             </intent-filter>
@@ -60,7 +61,6 @@
             </intent-filter>
          </activity>
 		<activity android:name="org.linphone.ConferenceActivity"
-		            android:launchMode="singleTop"
         			android:theme="@android:style/Theme.NoTitleBar.Fullscreen">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/res/drawable/resume_blue.png b/res/drawable/resume_blue.png
new file mode 100644
index 0000000000000000000000000000000000000000..8274e4a8d0449dbfb9b0a32ad6584bb4bed13e90
GIT binary patch
literal 2927
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
Z@?Sm+38-O2g5CfC002ovPDHLkV1gIyg~b2>

literal 0
HcmV?d00001

diff --git a/res/layout-land/dialer.xml b/res/layout-land/dialer.xml
index b18e0dd33..9502261f6 100644
--- a/res/layout-land/dialer.xml
+++ b/res/layout-land/dialer.xml
@@ -40,6 +40,7 @@
 
 
 		<LinearLayout android:id="@+id/CallControlRow" android:layout_height="wrap_content" android:layout_width="fill_parent" android:gravity="bottom">
+			<ImageButton android:id="@+id/BackToConference" android:src="@drawable/resume_blue" android:layout_height="fill_parent" android:layout_width="fill_parent" android:layout_weight="1" android:background="@drawable/clavier_bg" android:visibility="gone"/>
 			<org.linphone.ui.CallButton android:id="@+id/Call"
 				android:layout_height="fill_parent" android:layout_width="fill_parent" android:layout_weight="1" android:background="@drawable/clavier_bg" android:src="@drawable/startcall_green"/>
 			<org.linphone.ui.HangCallButton android:id="@+id/Decline" android:layout_height="fill_parent" android:layout_width="fill_parent"
diff --git a/res/layout/dialer.xml b/res/layout/dialer.xml
index a5b8ed433..4af69efbc 100644
--- a/res/layout/dialer.xml
+++ b/res/layout/dialer.xml
@@ -39,13 +39,14 @@
 
 	<LinearLayout android:layout_height="wrap_content" android:orientation="vertical" android:layout_width="fill_parent">
 		<LinearLayout android:id="@+id/CallControlRow" android:layout_height="fill_parent" android:layout_width="fill_parent">
-			<org.linphone.ui.CallButton android:id="@+id/Call" android:layout_height="fill_parent" android:layout_width="fill_parent" android:layout_weight="0.25" android:src="@drawable/startcall_green" android:background="@drawable/clavier_bg"/>
-			<org.linphone.ui.HangCallButton android:id="@+id/Decline" android:layout_height="fill_parent" android:layout_width="fill_parent" android:layout_weight="0.25" android:src="@drawable/stopcall_red" android:background="@drawable/clavier_bg"/>
+			<ImageButton android:id="@+id/BackToConference" android:src="@drawable/resume_blue" android:layout_height="fill_parent" android:layout_width="fill_parent" android:layout_weight="1" android:background="@drawable/clavier_bg" android:visibility="gone"/>
+			<org.linphone.ui.CallButton android:id="@+id/Call" android:layout_height="fill_parent" android:layout_width="fill_parent" android:layout_weight="1" android:src="@drawable/startcall_green" android:background="@drawable/clavier_bg"/>
+			<org.linphone.ui.HangCallButton android:id="@+id/Decline" android:layout_height="fill_parent" android:layout_width="fill_parent" android:layout_weight="1" android:src="@drawable/stopcall_red" android:background="@drawable/clavier_bg"/>
 		</LinearLayout>
 
 		<LinearLayout android:id="@+id/IncallControlRow" android:layout_height="fill_parent" android:layout_width="fill_parent" android:visibility="gone">
-			<org.linphone.ui.AddVideoButton android:id="@+id/AddVideo" android:src="@drawable/startvideo_green" android:layout_height="fill_parent" android:layout_width="fill_parent" android:layout_weight="0.25" android:background="@drawable/clavier_bg"/>
-			<org.linphone.ui.HangCallButton android:id="@+id/HangUp" android:src="@drawable/stopcall_red" android:layout_height="fill_parent" android:layout_width="fill_parent" android:layout_weight="0.25" android:background="@drawable/clavier_bg"/>
+			<org.linphone.ui.AddVideoButton android:id="@+id/AddVideo" android:src="@drawable/startvideo_green" android:layout_height="fill_parent" android:layout_width="fill_parent" android:layout_weight="1" android:background="@drawable/clavier_bg"/>
+			<org.linphone.ui.HangCallButton android:id="@+id/HangUp" android:src="@drawable/stopcall_red" android:layout_height="fill_parent" android:layout_width="fill_parent" android:layout_weight="1" android:background="@drawable/clavier_bg"/>
 		</LinearLayout>
 
 		<EditText android:id="@+id/status_label" android:clickable="false" android:focusable="false" android:cursorVisible="false" android:textSize="12sp" android:height="15sp" android:layout_height="wrap_content" android:layout_width="fill_parent" android:background="@android:color/transparent" android:textColor="@android:color/white" />
diff --git a/res/layout/incoming.xml b/res/layout/incoming.xml
index 91e53bbdd..4b0f71816 100644
--- a/res/layout/incoming.xml
+++ b/res/layout/incoming.xml
@@ -28,7 +28,7 @@
 	</LinearLayout>
 
 
-	<org.linphone.ui.CallButton android:id="@+id/Answer"
+	<ImageButton android:id="@+id/Answer"
 		android:src="@drawable/startcall_green" android:layout_width="wrap_content"
 		android:layout_height="wrap_content" 
 		android:text="answer"
@@ -36,7 +36,7 @@
 		android:layout_alignParentLeft="true" android:layout_marginBottom="40sp"
 		android:layout_alignParentBottom="true"/>
 
-	<org.linphone.ui.HangCallButton android:id="@+id/Decline"
+	<ImageButton android:id="@+id/Decline"
 		android:src="@drawable/stopcall_red" android:layout_width="wrap_content"
 		android:layout_height="wrap_content" 
 		android:text="decline" 
diff --git a/res/values/strings.xml b/res/values/strings.xml
index f96ab8ce1..d98f80f9a 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
+	<string name="waiting_for_startup">Starting up...</string>
+	<string name="couldnt_accept_call">An error occurred while accepting call</string>
+
 	<string name="uri_picking_canceled">Canceled</string>
 	<string name="error_adding_new_call">Error adding new call</string>
 	<string name="transfer_started">Transfer started</string>
diff --git a/src/org/linphone/ConferenceActivity.java b/src/org/linphone/ConferenceActivity.java
index f201b2d7b..20fc2e9f7 100644
--- a/src/org/linphone/ConferenceActivity.java
+++ b/src/org/linphone/ConferenceActivity.java
@@ -32,6 +32,7 @@ import org.linphone.core.LinphoneCore;
 import org.linphone.core.LinphoneCoreException;
 import org.linphone.core.Log;
 import org.linphone.core.LinphoneCall.State;
+import org.linphone.mediastream.Version;
 import org.linphone.mediastream.video.capture.hwconf.Hacks;
 
 import android.app.AlertDialog;
@@ -123,6 +124,11 @@ public class ConferenceActivity extends ListActivity implements
 		workaroundStatusBarBug();
 	}
 
+	@Override
+	protected void onNewIntent(Intent intent) {
+		super.onNewIntent(intent);
+	}
+
 	protected void registerLinphoneListener(boolean register) {
 		if (register)
 			LinphoneManager.getInstance().addListener(this);
@@ -135,6 +141,8 @@ public class ConferenceActivity extends ListActivity implements
 		active=true;
 		registerLinphoneListener(true);
 		updateConfState();
+		boolean showSimpleActions = lc().getConferenceSize() == 0 && lc().getCallsNb() == 2;
+		findViewById(R.id.conf_simple_merge).setVisibility(showSimpleActions ? VISIBLE : GONE);
 		super.onResume();
 	}
 
@@ -205,9 +213,6 @@ public class ConferenceActivity extends ListActivity implements
 	public void onClick(View v) {
 		switch (v.getId()) {
 		case R.id.addCall:
-			Toast.makeText(this,
-					"Should now finish this activity to go back to dialer",
-					Toast.LENGTH_LONG).show();
 			Intent intent = new Intent().setClass(this, UriPickerActivity.class);
 			intent.putExtra(UriPickerActivity.EXTRA_PICKER_TYPE, UriPickerActivity.EXTRA_PICKER_TYPE_ADD);
 			startActivityForResult(intent, ID_ADD_CALL);
@@ -305,7 +310,6 @@ public class ConferenceActivity extends ListActivity implements
 				}
 				break;
 			case R.id.transfer_existing:
-				Toast.makeText(ConferenceActivity.this, "Transfer choice selected", Toast.LENGTH_LONG).show();
 				@SuppressWarnings("unchecked") final List<LinphoneCall> existingCalls = lc().getCalls();
 				existingCalls.remove(call);
 				final List<String> numbers = new ArrayList<String>(existingCalls.size());
@@ -322,7 +326,6 @@ public class ConferenceActivity extends ListActivity implements
 				new AlertDialog.Builder(ConferenceActivity.this).setAdapter(adapter, l).create().show();
 				break;
 			case R.id.transfer_new:
-				Toast.makeText(ConferenceActivity.this, "Transfer choice selected : to do, create activity to select new call", Toast.LENGTH_LONG).show();
 				Intent intent = new Intent().setClass(ConferenceActivity.this, UriPickerActivity.class);
 				intent.putExtra(UriPickerActivity.EXTRA_PICKER_TYPE, UriPickerActivity.EXTRA_PICKER_TYPE_TRANSFER);
 				callToTransfer = call;	
@@ -342,7 +345,6 @@ public class ConferenceActivity extends ListActivity implements
 
 		public CalleeListAdapter(List<LinphoneCall> calls) {
 			linphoneCalls = calls;
-
 		}
 
 		public int getCount() {
@@ -452,7 +454,9 @@ public class ConferenceActivity extends ListActivity implements
 			setVisibility(removeFromConfButton, false);
 			
 			final int numberOfCalls = linphoneCalls.size();
-			setVisibility(v, R.id.addVideo, !isInConference && !showUnhook && numberOfCalls == 1);
+			boolean showAddVideo = !isInConference && !showUnhook && numberOfCalls == 1
+					&& Version.isVideoCapable() && LinphoneManager.getInstance().isVideoEnabled();
+			setVisibility(v, R.id.addVideo, showAddVideo);
 
 			boolean statusPaused = state== State.Paused || state == State.PausedByRemote;
 			setVisibility(v, R.id.callee_status_paused, statusPaused);
@@ -553,7 +557,7 @@ public class ConferenceActivity extends ListActivity implements
 		if (!inConfC1 && inConfC2)
 			return 1;
 
-		int durationDiff = c1.getDuration() - c2.getDuration();
+		int durationDiff = c2.getDuration() - c1.getDuration();
 		return durationDiff;
 
 	}
diff --git a/src/org/linphone/DialerActivity.java b/src/org/linphone/DialerActivity.java
index 50a6b6910..9d6013d0d 100644
--- a/src/org/linphone/DialerActivity.java
+++ b/src/org/linphone/DialerActivity.java
@@ -63,7 +63,7 @@ import android.widget.Toast;
  * </ul>
  *
  */
-public class DialerActivity extends LinphoneManagerWaitActivity implements LinphoneGuiListener, NewOutgoingCallUiListener {
+public class DialerActivity extends LinphoneManagerWaitActivity implements LinphoneGuiListener, NewOutgoingCallUiListener, OnClickListener {
 	
 	private TextView mStatus;
 	private View mHangup;
@@ -126,6 +126,7 @@ public class DialerActivity extends LinphoneManagerWaitActivity implements Linph
 
 
 		mCallControlRow = findViewById(R.id.CallControlRow);
+		mCallControlRow.findViewById(R.id.BackToConference).setOnClickListener(this);
 		mAddressLayout = findViewById(R.id.Addresslayout);
 
 		mInCallControlRow = findViewById(R.id.IncallControlRow);
@@ -319,7 +320,9 @@ public class DialerActivity extends LinphoneManagerWaitActivity implements Linph
 
 	private void callPending(final LinphoneCall call) {
 		if (getResources().getBoolean(R.bool.use_incoming_call_activity)) {
-			Intent intent = new Intent().setClass(this, IncomingCallActivity.class);
+			Intent intent = new Intent()
+					.setClass(this, IncomingCallActivity.class)
+					.putExtra("stringUri", call.getRemoteAddress().asStringUriOnly());
 			startActivityForResult(intent, INCOMING_CALL_ACTIVITY);
 		} else if (getResources().getBoolean(R.bool.use_incoming_call_dialog)) {
 			showDialog(incomingCallDialogId);
@@ -462,6 +465,8 @@ public class DialerActivity extends LinphoneManagerWaitActivity implements Linph
 				mCurrentCall=null;
 			}
 		}
+
+		updateCallControlRow();
 	}
 
 	private void showToast(int id, String txt) {
@@ -498,6 +503,8 @@ public class DialerActivity extends LinphoneManagerWaitActivity implements Linph
 
 	@Override
 	protected void onResume() {
+		updateCallControlRow();
+
 		// When coming back from a video call, if the phone orientation is different
 		// Android will destroy the previous Dialer and create a new one.
 		// Unfortunately the "call end" status event is received in the meanwhile
@@ -510,4 +517,38 @@ public class DialerActivity extends LinphoneManagerWaitActivity implements Linph
 		super.onResume();
 	}
 
+
+	private void updateCallControlRow() {
+		if (useConferenceActivity) {
+			if (LinphoneManager.isInstanciated()) {
+				LinphoneCore lc = LinphoneManager.getLc();
+				int calls = lc.getCallsNb();
+				View backToConf = mCallControlRow.findViewById(R.id.BackToConference);
+				View callButton = mCallControlRow.findViewById(R.id.Call);
+				View hangButton = mCallControlRow.findViewById(R.id.Decline);
+				if (calls > 0) {
+					backToConf.setVisibility(View.VISIBLE);
+					callButton.setVisibility(View.GONE);
+					hangButton.setEnabled(true);
+				} else {
+					backToConf.setVisibility(View.GONE);
+					callButton.setVisibility(View.VISIBLE);
+					hangButton.setEnabled(false);
+				}
+			}
+		}
+	}
+
+
+	@Override
+	public void onClick(View v) {
+		switch (v.getId()) {
+		case R.id.BackToConference:
+			LinphoneActivity.instance().startConferenceActivity();
+			break;
+		default:
+			break;
+		}
+		
+	}
 }
diff --git a/src/org/linphone/IncomingCallActivity.java b/src/org/linphone/IncomingCallActivity.java
index 442be6247..d60fc20df 100644
--- a/src/org/linphone/IncomingCallActivity.java
+++ b/src/org/linphone/IncomingCallActivity.java
@@ -20,17 +20,17 @@ package org.linphone;
 
 import org.linphone.core.LinphoneAddress;
 import org.linphone.core.LinphoneCall;
-import org.linphone.core.LinphoneCore;
-import org.linphone.ui.CallButton;
-import org.linphone.ui.HangCallButton;
+import org.linphone.core.Log;
 
 import android.app.Activity;
+import android.content.Intent;
 import android.os.Bundle;
 import android.view.KeyEvent;
 import android.view.View;
 import android.view.WindowManager;
 import android.view.View.OnClickListener;
 import android.widget.TextView;
+import android.widget.Toast;
 
 /**
  * Activity displayed when a call comes in.
@@ -44,11 +44,18 @@ public class IncomingCallActivity extends Activity implements OnClickListener {
 	private TextView mNumberView;
 	private LinphoneCall mCall;
 
-	
+	private void findIncomingCall(Intent intent) {
+		String stringUri = intent.getStringExtra("stringUri");
+		mCall = LinphoneManager.getInstance().retrieveIncomingCall(stringUri);
+		if (mCall == null) {
+			Log.e("Couldn't find incoming call from ", stringUri);
+			Toast.makeText(this, "Error", Toast.LENGTH_SHORT);
+		}
+	}
+
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
-		LinphoneCore lc = LinphoneManager.getLc();
-		mCall = lc.getCurrentCall();
+		findIncomingCall(getIntent());
 
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.incoming);
@@ -56,10 +63,8 @@ public class IncomingCallActivity extends Activity implements OnClickListener {
 		mNameView = (TextView) findViewById(R.id.incoming_caller_name);
 		mNumberView = (TextView) findViewById(R.id.incoming_caller_number);
 
-		HangCallButton hang = (HangCallButton) findViewById(R.id.Decline);
-		CallButton accept = (CallButton) findViewById(R.id.Answer);
-		hang.setExternalClickListener(this);
-		accept.setExternalClickListener(this);
+		findViewById(R.id.Decline).setOnClickListener(this);
+		findViewById(R.id.Answer).setOnClickListener(this);
 		
         // set this flag so this activity will stay in front of the keyguard
         int flags = WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED;
@@ -67,6 +72,12 @@ public class IncomingCallActivity extends Activity implements OnClickListener {
         getWindow().addFlags(flags);
 	}
 
+	@Override
+	protected void onNewIntent(Intent intent) {
+		findIncomingCall(intent);
+		super.onNewIntent(intent);
+	}
+	
 	@Override
 	protected void onResume() {
 		LinphoneAddress address = mCall.getRemoteAddress();
@@ -80,12 +91,26 @@ public class IncomingCallActivity extends Activity implements OnClickListener {
 	public boolean onKeyDown(int keyCode, KeyEvent event) {
 		if (keyCode == KeyEvent.KEYCODE_BACK || keyCode == KeyEvent.KEYCODE_HOME) {
 			LinphoneManager.getLc().terminateCall(mCall);
+			finish();
 		}
 		return super.onKeyDown(keyCode, event);
 	}
 
 	@Override
 	public void onClick(View v) {
+		switch (v.getId()) {
+		case R.id.Answer:
+			if (!LinphoneManager.getInstance().acceptCall(mCall)) {
+				// the above method takes care of Samsung Galaxy S
+				Toast.makeText(this, R.string.couldnt_accept_call, Toast.LENGTH_LONG);
+			}
+			break;
+		case R.id.Decline:
+			LinphoneManager.getLc().terminateCall(mCall);
+			break;
+		default:
+			throw new RuntimeException();
+		}
 		finish();
 	}
 }
diff --git a/src/org/linphone/LinphoneActivity.java b/src/org/linphone/LinphoneActivity.java
index 3f30cfda6..b88e16aa5 100644
--- a/src/org/linphone/LinphoneActivity.java
+++ b/src/org/linphone/LinphoneActivity.java
@@ -515,7 +515,9 @@ public class LinphoneActivity extends TabActivity implements SensorEventListener
 	}
 
 	public void startConferenceActivity() {
-		if (ConferenceActivity.active) return;
+		if (ConferenceActivity.active) {
+			return;
+		}
 
 		mHandler.post(new Runnable() {
 			public void run() {
diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java
index 69985dec8..38131d12a 100644
--- a/src/org/linphone/LinphoneManager.java
+++ b/src/org/linphone/LinphoneManager.java
@@ -887,7 +887,7 @@ public final class LinphoneManager implements LinphoneCoreListener {
 			listenerDispatcher.onAlreadyInVideoCall();
 		}
 	}
-
+	
 	public boolean acceptCallIfIncomingPending() throws LinphoneCoreException {
 		if (Hacks.needGalaxySAudioHack() || lpm.useGalaxySHack())
 			setAudioModeIncallForGalaxyS();
@@ -899,6 +899,19 @@ public final class LinphoneManager implements LinphoneCoreListener {
 		return false;
 	}
 
+	public boolean acceptCall(LinphoneCall call) {
+		if (Hacks.needGalaxySAudioHack() || lpm.useGalaxySHack())
+			setAudioModeIncallForGalaxyS();
+
+		try {
+			mLc.acceptCall(call);
+			return true;
+		} catch (LinphoneCoreException e) {
+			Log.i(e, "Accept call failed");
+		}
+		return false;
+	}
+
 	public static String extractIncomingRemoteName(Resources r, LinphoneAddress linphoneAddress) {
 		if (!r.getBoolean(R.bool.show_full_remote_address_on_incoming_call))
 			return extractADisplayName(r, linphoneAddress);
@@ -946,6 +959,7 @@ public final class LinphoneManager implements LinphoneCoreListener {
 
 	private static class ListenerDispatcher implements LinphoneServiceListener {
 		private LinphoneServiceListener serviceListener;
+		private List<LinphoneCall> incomingCalls = new ArrayList<LinphoneCall>();
 		List<LinphoneSimpleListener> simpleListeners;
 		public ListenerDispatcher(List<LinphoneSimpleListener> simpleListeners) {
 			this.simpleListeners = simpleListeners;
@@ -973,8 +987,20 @@ public final class LinphoneManager implements LinphoneCoreListener {
 			if (serviceListener != null) serviceListener.onCallEncryptionChanged(call, encrypted, authenticationToken);
 		}
 
+		public LinphoneCall retrieveIncomingCall(String stringUri) {
+			for (LinphoneCall call : incomingCalls) {
+				if (stringUri.equals(call.getRemoteAddress().asStringUriOnly())) {
+					return call;
+				}
+			}
+			return null;
+		}
+
 		public void onCallStateChanged(LinphoneCall call, State state,
 				String message) {
+			if (State.IncomingReceived.equals(state)) {
+				incomingCalls.add(call);
+			}
 			if (serviceListener != null) serviceListener.onCallStateChanged(call, state, message);
 			for (LinphoneOnCallStateChangedListener l : getSimpleListeners(LinphoneOnCallStateChangedListener.class)) {
 				l.onCallStateChanged(call, state, message);
@@ -1009,11 +1035,13 @@ public final class LinphoneManager implements LinphoneCoreListener {
 		public void tryingNewOutgoingCallButWrongDestinationAddress() {
 			if (serviceListener != null) serviceListener.tryingNewOutgoingCallButWrongDestinationAddress();
 		}
-		
 	}
 
-
 	public static final boolean isInstanciated() {
 		return instance != null;
 	}
+
+	public LinphoneCall retrieveIncomingCall(String stringUri) {
+		return listenerDispatcher.retrieveIncomingCall(stringUri);
+	}
 }
diff --git a/src/org/linphone/core/LinphoneCallImpl.java b/src/org/linphone/core/LinphoneCallImpl.java
index c96593d63..3f153e0fc 100644
--- a/src/org/linphone/core/LinphoneCallImpl.java
+++ b/src/org/linphone/core/LinphoneCallImpl.java
@@ -84,9 +84,21 @@ class LinphoneCallImpl implements LinphoneCall {
 	public boolean cameraEnabled() {
 		return cameraEnabled(nativePtr);
 	}
+
+	@Override
 	public boolean equals(Object call) {
+		if (this == call) return true;
+		if (call == null) return false;
+		if (!(call instanceof LinphoneCallImpl)) return false;
 		return nativePtr == ((LinphoneCallImpl)call).nativePtr;
 	}
+
+	@Override
+	public int hashCode() {
+		int result = 17;
+		result = 31 * result + (int) (nativePtr ^ (nativePtr >>> 32));
+		return result;
+	}
 	public void enableEchoCancellation(boolean enable) {
 		enableEchoCancellation(nativePtr,enable);
 		

From c655746a1f805f7ee185b12fe451116063273580 Mon Sep 17 00:00:00 2001
From: Guillaume Beraudo <guillaume.beraudo@belledonne-communications.com>
Date: Fri, 30 Sep 2011 10:39:05 +0200
Subject: [PATCH 10/62] Fix manager waiter API.

---
 src/org/linphone/ConferenceActivity.java      |  27 ++++-
 src/org/linphone/DialerActivity.java          |  24 ++--
 .../linphone/LinphoneManagerWaitActivity.java | 103 ------------------
 3 files changed, 37 insertions(+), 117 deletions(-)
 delete mode 100644 src/org/linphone/LinphoneManagerWaitActivity.java

diff --git a/src/org/linphone/ConferenceActivity.java b/src/org/linphone/ConferenceActivity.java
index 20fc2e9f7..7ee40cef1 100644
--- a/src/org/linphone/ConferenceActivity.java
+++ b/src/org/linphone/ConferenceActivity.java
@@ -26,6 +26,7 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 
+import org.linphone.LinphoneManagerWaitHelper.LinphoneManagerReadyListener;
 import org.linphone.LinphoneSimpleListener.LinphoneOnCallStateChangedListener;
 import org.linphone.core.LinphoneCall;
 import org.linphone.core.LinphoneCore;
@@ -58,6 +59,7 @@ import android.widget.ToggleButton;
  * @author Guillaume Beraudo
  */
 public class ConferenceActivity extends ListActivity implements
+		LinphoneManagerReadyListener,
 		LinphoneOnCallStateChangedListener, Comparator<LinphoneCall>,
 		OnClickListener {
 
@@ -90,6 +92,7 @@ public class ConferenceActivity extends ListActivity implements
 	private static final int ID_TRANSFER_CALL = 2;
 
 
+
 	private void workaroundStatusBarBug() {
 		getWindow().setFlags(
 				WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS,
@@ -102,6 +105,7 @@ public class ConferenceActivity extends ListActivity implements
 		lc().leaveConference();
 	}
 
+	private LinphoneManagerWaitHelper waitHelper;
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		setContentView(R.layout.conferencing);
@@ -119,9 +123,22 @@ public class ConferenceActivity extends ListActivity implements
 		findViewById(R.id.toggleMuteMic).setOnClickListener(this);
 		findViewById(R.id.toggleSpeaker).setOnClickListener(this);
 
+		waitHelper = new LinphoneManagerWaitHelper(this, this);
+		waitHelper.doManagerDependentOnCreate();
+		workaroundStatusBarBug();
+	}
+
+	@Override
+	public void onCreateWhenManagerReady() {
 		List<LinphoneCall> calls = getInitialCalls();
 		setListAdapter(new CalleeListAdapter(calls));
-		workaroundStatusBarBug();
+	}
+	@Override
+	public void onResumeWhenManagerReady() {
+		registerLinphoneListener(true);
+		updateConfState();
+		boolean showSimpleActions = lc().getConferenceSize() == 0 && lc().getCallsNb() == 2;
+		findViewById(R.id.conf_simple_merge).setVisibility(showSimpleActions ? VISIBLE : GONE);
 	}
 
 	@Override
@@ -136,13 +153,12 @@ public class ConferenceActivity extends ListActivity implements
 			LinphoneManager.getInstance().removeListener(this);
 	}
 
+
+
 	@Override
 	protected void onResume() {
 		active=true;
-		registerLinphoneListener(true);
-		updateConfState();
-		boolean showSimpleActions = lc().getConferenceSize() == 0 && lc().getCallsNb() == 2;
-		findViewById(R.id.conf_simple_merge).setVisibility(showSimpleActions ? VISIBLE : GONE);
+		waitHelper.doManagerDependentOnResume();
 		super.onResume();
 	}
 
@@ -589,6 +605,7 @@ public class ConferenceActivity extends ListActivity implements
 			throw new RuntimeException("unhandled request code " + requestCode);
 		}
 	}
+
 	
 	/*
 	 * public int compare(LinphoneCall c1, LinphoneCall c2) { if (c1 == c2)
diff --git a/src/org/linphone/DialerActivity.java b/src/org/linphone/DialerActivity.java
index 9d6013d0d..b025baf2a 100644
--- a/src/org/linphone/DialerActivity.java
+++ b/src/org/linphone/DialerActivity.java
@@ -19,6 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 package org.linphone;
 
 import org.linphone.LinphoneManager.NewOutgoingCallUiListener;
+import org.linphone.LinphoneManagerWaitHelper.LinphoneManagerReadyListener;
 import org.linphone.LinphoneService.LinphoneGuiListener;
 import org.linphone.core.CallDirection;
 import org.linphone.core.LinphoneAddress;
@@ -63,7 +64,7 @@ import android.widget.Toast;
  * </ul>
  *
  */
-public class DialerActivity extends LinphoneManagerWaitActivity implements LinphoneGuiListener, NewOutgoingCallUiListener, OnClickListener {
+public class DialerActivity extends SoftVolumeActivity implements LinphoneGuiListener, LinphoneManagerReadyListener, NewOutgoingCallUiListener, OnClickListener {
 	
 	private TextView mStatus;
 	private View mHangup;
@@ -101,7 +102,7 @@ public class DialerActivity extends LinphoneManagerWaitActivity implements Linph
 		return instance;
 	}
 
-	
+	private LinphoneManagerWaitHelper waitHelper;
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.dialer);
@@ -151,11 +152,13 @@ public class DialerActivity extends LinphoneManagerWaitActivity implements Linph
 
 		checkIfOutgoingCallIntentReceived();
 
+		waitHelper = new LinphoneManagerWaitHelper(this, this);
+		waitHelper.doManagerDependentOnCreate();
 		instance = this;
 	}
 
 	@Override
-	protected void onLinphoneManagerAvailable(LinphoneManager m) {
+	public void onCreateWhenManagerReady() {
 		LinphoneCore lc = LinphoneManager.getLc();
 		if (lc.isIncall()) {
 			if(lc.isInComingInvitePending()) {
@@ -344,8 +347,6 @@ public class DialerActivity extends LinphoneManagerWaitActivity implements Linph
 	@Override
 	protected Dialog onCreateDialog(int id) {
 		if (id == incomingCallDialogId) {
-			LinphoneAddress address = LinphoneManager.getLc().getRemoteAddress();
-			String from = LinphoneManager.extractIncomingRemoteName(getResources(), address);
 			View incomingCallView = getLayoutInflater().inflate(R.layout.incoming_call, null);
 
 			final Dialog dialog = new AlertDialog.Builder(this)
@@ -375,6 +376,8 @@ public class DialerActivity extends LinphoneManagerWaitActivity implements Linph
 			});
 
 			return dialog;
+		} else if (id == LinphoneManagerWaitHelper.DIALOG_ID) {
+			return waitHelper.createWaitDialog();
 		} else {
 			return super.onCreateDialog(id);
 		}
@@ -502,7 +505,7 @@ public class DialerActivity extends LinphoneManagerWaitActivity implements Linph
 	}
 
 	@Override
-	protected void onResume() {
+	public void onResumeWhenManagerReady() {
 		updateCallControlRow();
 
 		// When coming back from a video call, if the phone orientation is different
@@ -511,9 +514,12 @@ public class DialerActivity extends LinphoneManagerWaitActivity implements Linph
 		// and set to the to be destroyed Dialer.
 		// Note1: We wait as long as possible before setting the last message.
 		// Note2: Linphone service is in charge of instantiating LinphoneManager
-		if (LinphoneService.isReady()) {
-			mStatus.setText(LinphoneManager.getInstance().getLastLcStatusMessage());
-		}
+		mStatus.setText(LinphoneManager.getInstance().getLastLcStatusMessage());
+	}
+
+	@Override
+	protected void onResume() {
+		waitHelper.doManagerDependentOnResume();
 		super.onResume();
 	}
 
diff --git a/src/org/linphone/LinphoneManagerWaitActivity.java b/src/org/linphone/LinphoneManagerWaitActivity.java
deleted file mode 100644
index 3899aefb3..000000000
--- a/src/org/linphone/LinphoneManagerWaitActivity.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
-LinphoneManagerWaitActivity.java
-Copyright (C) 2011  Belledonne Communications, Grenoble, France
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-package org.linphone;
-
-import org.linphone.core.Log;
-
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.os.Bundle;
-import android.os.Handler;
-import android.view.View;
-
-/**
- * Activity requiring access to LinphoneManager should inherit from this class.
- * 
- * @author Guillaume Beraudo
- *
- */
-public abstract class LinphoneManagerWaitActivity extends SoftVolumeActivity {
-
-	private final int waitServiceDialogId = 314159265;
-	private Handler mHandler = new Handler();
-
-	@Override
-	protected void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-
-		if (LinphoneService.isReady()) {
-			onLinphoneManagerAvailable(LinphoneManager.getInstance());
-		} else {
-			showDialog(waitServiceDialogId);
-			thread = new ServiceWaitThread();
-			thread.start();
-		}
-	}
-
-	private ServiceWaitThread thread;
-
-	@Override
-	protected void onDestroy() {
-		if (thread != null) thread.interrupt();
-		super.onDestroy();
-	}
-
-	@Override
-	protected Dialog onCreateDialog(int id) {
-		if (id == waitServiceDialogId) {
-			View v = getLayoutInflater().inflate((R.layout.wait_service_dialog), null);
-			return new AlertDialog.Builder(this).setView(v).setCancelable(false).create();
-		}
-		return super.onCreateDialog(id);
-	}
-
-	protected abstract void onLinphoneManagerAvailable(LinphoneManager m);
-
-	private void dismissDialogFromThread(final int id) {
-		mHandler.post(new Runnable() {
-			@Override
-			public void run() {
-				try {
-					dismissDialog(id);
-				} catch (Throwable e) {
-					// Discarding exception which may be thrown if the dialog wasn't showing.
-				}
-			}
-		});
-	}
-
-	private class ServiceWaitThread extends Thread {
-		@Override
-		public void run() {
-			while (!LinphoneService.isReady()) {
-				try {
-					sleep(30);
-				} catch (InterruptedException e) {
-					Log.e("waiting thread sleep() has been interrupted, exiting as requested");
-					dismissDialogFromThread(waitServiceDialogId); // FIXME, may not be the best thing to do
-					return;
-				}
-			}
-			onLinphoneManagerAvailable(LinphoneManager.getInstance());
-			dismissDialogFromThread(waitServiceDialogId);
-			super.run();
-		}
-	}
-
-}

From f8892448ad8f5c10510a958b9e46473a68727900 Mon Sep 17 00:00:00 2001
From: Guillaume Beraudo <guillaume.beraudo@belledonne-communications.com>
Date: Fri, 30 Sep 2011 11:39:04 +0200
Subject: [PATCH 11/62] Better conference callee appearance.

---
 res/layout/conf_callee.xml               |  2 +-
 res/values/callee_style.xml              |  6 ++++--
 src/org/linphone/ConferenceActivity.java | 17 +++++++++++++----
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/res/layout/conf_callee.xml b/res/layout/conf_callee.xml
index eb117bc4b..74d923c93 100644
--- a/res/layout/conf_callee.xml
+++ b/res/layout/conf_callee.xml
@@ -30,7 +30,7 @@
 	<LinearLayout android:id="@+id/callee_statuses" android:layout_toLeftOf="@id/callee_buttons"
 	  android:layout_width="wrap_content" android:layout_height="fill_parent"
 	  android:layout_centerVertical="true">
-	  	<TextView android:id="@+id/status_label" style="@style/callee_status"/>
+	  	<TextView android:id="@+id/status_label" style="@style/callee_status" />
 	  	<ImageView android:id="@+id/callee_status_paused" style="@style/callee_status" android:src="@drawable/conf_status_paused" />
 		<ImageView android:id="@+id/callee_status_inconf" style="@style/callee_status" android:src="@drawable/conf_status_inconf"/>
 	</LinearLayout>
diff --git a/res/values/callee_style.xml b/res/values/callee_style.xml
index 6231cfc25..5a82de385 100644
--- a/res/values/callee_style.xml
+++ b/res/values/callee_style.xml
@@ -1,15 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <style name="callee_name" parent="@android:style/TextAppearance.Medium">
+    <style name="callee_name" parent="@android:style/TextAppearance.Large">
         <item name="android:layout_width">fill_parent</item>
         <item name="android:layout_height">fill_parent</item>
         <item name="android:layout_weight">1</item>
+        <item name="android:gravity">fill_vertical</item>
     </style>
 
-    <style name="callee_address" parent="@android:style/TextAppearance">
+    <style name="callee_address" parent="@android:style/TextAppearance.Medium">
         <item name="android:layout_width">fill_parent</item>
         <item name="android:layout_height">fill_parent</item>
         <item name="android:layout_weight">1</item>
+        <item name="android:gravity">fill_vertical</item>
     </style>
 
 	<style name="callee_status">
diff --git a/src/org/linphone/ConferenceActivity.java b/src/org/linphone/ConferenceActivity.java
index 7ee40cef1..515ebb4e7 100644
--- a/src/org/linphone/ConferenceActivity.java
+++ b/src/org/linphone/ConferenceActivity.java
@@ -44,6 +44,7 @@ import android.content.Intent;
 import android.content.res.Resources;
 import android.os.Bundle;
 import android.os.Handler;
+import android.text.TextUtils;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowManager;
@@ -418,10 +419,18 @@ public class ConferenceActivity extends ListActivity implements
 			final LinphoneCall call = linphoneCalls.get(position);
 			final LinphoneCall.State state = call.getState();
 
-			((TextView) v.findViewById(R.id.name)).setText(call
-					.getRemoteAddress().getDisplayName());
-			((TextView) v.findViewById(R.id.address)).setText(call
-					.getRemoteAddress().getUserName());
+			String mainText = call.getRemoteAddress().getDisplayName();
+			String complText = call.getRemoteAddress().getUserName();
+			TextView mainTextView = (TextView) v.findViewById(R.id.name);
+			TextView complTextView = (TextView) v.findViewById(R.id.address);
+			if (TextUtils.isEmpty(mainText)) {
+				mainTextView.setText(complText);
+				complTextView.setVisibility(View.GONE);
+			} else {
+				mainTextView.setText(mainText);
+				complTextView.setText(complText);
+				complTextView.setVisibility(View.VISIBLE);
+			}
 
 			final boolean isInConference = call.isInConference();
 			boolean currentlyActiveCall = !isInConference

From 546e6648f2a721a61a7f40d21e9ca1a4ca67b7b7 Mon Sep 17 00:00:00 2001
From: Guillaume Beraudo <guillaume.beraudo@belledonne-communications.com>
Date: Fri, 30 Sep 2011 13:51:46 +0200
Subject: [PATCH 12/62] Fix second incoming call from same uri crash.

---
 res/values/strings.xml                        |  1 +
 src/org/linphone/IncomingCallActivity.java    |  2 +-
 src/org/linphone/LinphoneManager.java         | 16 ----------------
 src/org/linphone/LinphoneService.java         |  2 +-
 src/org/linphone/core/LinphoneCoreImpl.java   |  7 +++++++
 src/org/linphone/ui/Digit.java                | 15 +++++++++++++++
 submodules/linphone                           |  2 +-
 test/org/linphone/TestConferenceActivity.java | 15 +++++++++++++--
 8 files changed, 39 insertions(+), 21 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index d98f80f9a..f923f6094 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -8,6 +8,7 @@
 	<string name="error_adding_new_call">Error adding new call</string>
 	<string name="transfer_started">Transfer started</string>
 
+	<string name="skipable_error_service_not_ready">Warning: service is not ready</string>
 
 	<string name="status_conf_call">conf</string>
 	<string name="status_active_call">active</string>
diff --git a/src/org/linphone/IncomingCallActivity.java b/src/org/linphone/IncomingCallActivity.java
index d60fc20df..5e3bccc3f 100644
--- a/src/org/linphone/IncomingCallActivity.java
+++ b/src/org/linphone/IncomingCallActivity.java
@@ -46,7 +46,7 @@ public class IncomingCallActivity extends Activity implements OnClickListener {
 
 	private void findIncomingCall(Intent intent) {
 		String stringUri = intent.getStringExtra("stringUri");
-		mCall = LinphoneManager.getInstance().retrieveIncomingCall(stringUri);
+		mCall = LinphoneManager.getLc().findCallFromUri(stringUri);
 		if (mCall == null) {
 			Log.e("Couldn't find incoming call from ", stringUri);
 			Toast.makeText(this, "Error", Toast.LENGTH_SHORT);
diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java
index 38131d12a..7279897fb 100644
--- a/src/org/linphone/LinphoneManager.java
+++ b/src/org/linphone/LinphoneManager.java
@@ -959,7 +959,6 @@ public final class LinphoneManager implements LinphoneCoreListener {
 
 	private static class ListenerDispatcher implements LinphoneServiceListener {
 		private LinphoneServiceListener serviceListener;
-		private List<LinphoneCall> incomingCalls = new ArrayList<LinphoneCall>();
 		List<LinphoneSimpleListener> simpleListeners;
 		public ListenerDispatcher(List<LinphoneSimpleListener> simpleListeners) {
 			this.simpleListeners = simpleListeners;
@@ -987,20 +986,8 @@ public final class LinphoneManager implements LinphoneCoreListener {
 			if (serviceListener != null) serviceListener.onCallEncryptionChanged(call, encrypted, authenticationToken);
 		}
 
-		public LinphoneCall retrieveIncomingCall(String stringUri) {
-			for (LinphoneCall call : incomingCalls) {
-				if (stringUri.equals(call.getRemoteAddress().asStringUriOnly())) {
-					return call;
-				}
-			}
-			return null;
-		}
-
 		public void onCallStateChanged(LinphoneCall call, State state,
 				String message) {
-			if (State.IncomingReceived.equals(state)) {
-				incomingCalls.add(call);
-			}
 			if (serviceListener != null) serviceListener.onCallStateChanged(call, state, message);
 			for (LinphoneOnCallStateChangedListener l : getSimpleListeners(LinphoneOnCallStateChangedListener.class)) {
 				l.onCallStateChanged(call, state, message);
@@ -1041,7 +1028,4 @@ public final class LinphoneManager implements LinphoneCoreListener {
 		return instance != null;
 	}
 
-	public LinphoneCall retrieveIncomingCall(String stringUri) {
-		return listenerDispatcher.retrieveIncomingCall(stringUri);
-	}
 }
diff --git a/src/org/linphone/LinphoneService.java b/src/org/linphone/LinphoneService.java
index 19a189a77..43e48678d 100644
--- a/src/org/linphone/LinphoneService.java
+++ b/src/org/linphone/LinphoneService.java
@@ -68,7 +68,7 @@ public final class LinphoneService extends Service implements LinphoneServiceLis
 	private Handler mHandler = new Handler();
 	private static LinphoneService instance;
 
-	static boolean isReady() { return (instance!=null);	}
+	public static boolean isReady() { return (instance!=null);	}
 
 	/**
 	 * @throws RuntimeException service not instantiated
diff --git a/src/org/linphone/core/LinphoneCoreImpl.java b/src/org/linphone/core/LinphoneCoreImpl.java
index a5b4b718c..8a40cdb9f 100644
--- a/src/org/linphone/core/LinphoneCoreImpl.java
+++ b/src/org/linphone/core/LinphoneCoreImpl.java
@@ -559,4 +559,11 @@ class LinphoneCoreImpl implements LinphoneCore {
 	public synchronized void transferCallToAnother(LinphoneCall call, LinphoneCall dest) {
 		transferCallToAnother(nativePtr, getCallPtr(call), getCallPtr(dest));
 	}
+
+	private native long findCallFromUri(long nativePtr, String uri);
+	@Override
+	public synchronized LinphoneCall findCallFromUri(String uri) {
+		long callPtr = findCallFromUri(nativePtr, uri);
+		return callPtr != 0 ? new LinphoneCallImpl(callPtr) : null;
+	}
 }
diff --git a/src/org/linphone/ui/Digit.java b/src/org/linphone/ui/Digit.java
index 902657045..e3de49152 100644
--- a/src/org/linphone/ui/Digit.java
+++ b/src/org/linphone/ui/Digit.java
@@ -19,13 +19,17 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 package org.linphone.ui;
 
 import org.linphone.LinphoneManager;
+import org.linphone.LinphoneService;
+import org.linphone.R;
 import org.linphone.core.LinphoneCore;
+import org.linphone.core.Log;
 
 import android.content.Context;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.view.View;
 import android.widget.Button;
+import android.widget.Toast;
 
 public class Digit extends Button implements AddressAware {
 
@@ -77,7 +81,16 @@ public class Digit extends Button implements AddressAware {
 			mKeyCode = Digit.this.getText().subSequence(0, 1);
 		}
 
+		private boolean linphoneServiceReady() {
+			if (!LinphoneService.isReady()) {
+				Log.w("Service is not ready while pressing digit");
+				Toast.makeText(getContext(), getContext().getString(R.string.skipable_error_service_not_ready), Toast.LENGTH_SHORT).show();
+				return false;
+			}
+			return true;
+		}
 		public void onClick(View v) {
+			if (!linphoneServiceReady()) return;
 			LinphoneCore lc = LinphoneManager.getLc();
 			lc.stopDtmf();
 			mIsDtmfStarted =false;
@@ -96,6 +109,7 @@ public class Digit extends Button implements AddressAware {
 		}
 
 		public boolean onTouch(View v, MotionEvent event) {
+			if (!linphoneServiceReady()) return true;
 			LinphoneCore lc = LinphoneManager.getLc();
 			if (event.getAction() == MotionEvent.ACTION_DOWN && mIsDtmfStarted ==false) {
 				LinphoneManager.getInstance().playDtmf(getContext().getContentResolver(), mKeyCode.charAt(0));
@@ -109,6 +123,7 @@ public class Digit extends Button implements AddressAware {
 		}
 		
 		public boolean onLongClick(View v) {
+			if (!linphoneServiceReady()) return true;
 			// Called if "0+" dtmf
 			LinphoneCore lc = LinphoneManager.getLc();
 			lc.stopDtmf();
diff --git a/submodules/linphone b/submodules/linphone
index 9ea9dcadb..df65d1137 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 9ea9dcadbd06bdc90cffc1e0e95d4e5d1c48fd8e
+Subproject commit df65d113730693274f1b35a516b0a065aa7c755c
diff --git a/test/org/linphone/TestConferenceActivity.java b/test/org/linphone/TestConferenceActivity.java
index 9d9adfc16..3510de0be 100644
--- a/test/org/linphone/TestConferenceActivity.java
+++ b/test/org/linphone/TestConferenceActivity.java
@@ -94,10 +94,12 @@ public class TestConferenceActivity extends ConferenceActivity {
 
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
+		LinphoneManagerWaitHelper.disabled=true;
 		super.onCreate(savedInstanceState);
-
 		//if (!serviceStarted) startService(new Intent(ACTION_MAIN).setClass(this, LinphoneService.class));
 
+		findViewById(R.id.toggleMuteMic).setOnClickListener(null);
+		findViewById(R.id.toggleSpeaker).setOnClickListener(null);
 	}
 
 
@@ -308,6 +310,15 @@ public class TestConferenceActivity extends ConferenceActivity {
 		public int getVideoDevice() {return 0;}
 		public void setDeviceRotation(int rotation) {}
 		public void setVideoDevice(int id) {}
+		@Override
+		public LinphoneCall findCallFromUri(String uri) {
+			for (LinphoneCall call : calls) {
+				if (call.getRemoteAddress().asStringUriOnly().equals(uri)) {
+					return call;
+				}
+			}
+			return null;
+		}
 	}
 
 
@@ -318,7 +329,7 @@ public class TestConferenceActivity extends ConferenceActivity {
 			this.displayName = niceName;
 			this.number = number;}
 		public String asString() {return displayName;}
-		public String asStringUriOnly() {return null;}
+		public String asStringUriOnly() {return getUserName() + "@" + getDomain();}
 		public String getDisplayName() {return displayName;}
 		public String getDomain() {return "example.org";}
 		public String getPort() {return "5060";}

From 9234d7f868764767e6b0cb4856396ec734ee5e3e Mon Sep 17 00:00:00 2001
From: Guillaume Beraudo <guillaume.beraudo@belledonne-communications.com>
Date: Fri, 30 Sep 2011 14:15:52 +0200
Subject: [PATCH 13/62] SoftvolumeActivity and go home changed to a helper.

conferenceActivity extends ListActivity already
---
 src/org/linphone/ConferenceActivity.java      | 22 +++++----
 src/org/linphone/DialerActivity.java          |  9 +++-
 src/org/linphone/IncallActivity.java          | 19 ++++----
 ...VolumeActivity.java => LinphoneUtils.java} | 47 +++++++++++--------
 src/org/linphone/VideoCallActivity.java       |  9 +++-
 5 files changed, 67 insertions(+), 39 deletions(-)
 rename src/org/linphone/{SoftVolumeActivity.java => LinphoneUtils.java} (51%)

diff --git a/src/org/linphone/ConferenceActivity.java b/src/org/linphone/ConferenceActivity.java
index 515ebb4e7..874d524e1 100644
--- a/src/org/linphone/ConferenceActivity.java
+++ b/src/org/linphone/ConferenceActivity.java
@@ -1,5 +1,5 @@
 /*
-AbstractLinphoneConferenceActivity.java
+ConferenceActivity.java
 Copyright (C) 2011  Belledonne Communications, Grenoble, France
 
 This program is free software; you can redistribute it and/or
@@ -34,7 +34,6 @@ import org.linphone.core.LinphoneCoreException;
 import org.linphone.core.Log;
 import org.linphone.core.LinphoneCall.State;
 import org.linphone.mediastream.Version;
-import org.linphone.mediastream.video.capture.hwconf.Hacks;
 
 import android.app.AlertDialog;
 import android.app.Dialog;
@@ -45,6 +44,7 @@ import android.content.res.Resources;
 import android.os.Bundle;
 import android.os.Handler;
 import android.text.TextUtils;
+import android.view.KeyEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowManager;
@@ -70,11 +70,6 @@ public class ConferenceActivity extends ListActivity implements
 
 	// Start Override to test block
 	protected LinphoneCore lc() {
-		final int waitSlice=20;
-		while(!LinphoneManager.isInstanciated()) {
-			Log.d("LinphoneManager is not ready, waiting for ",waitSlice, "ms");
-			Hacks.sleep(waitSlice);
-		}
 		return LinphoneManager.getLc();
 	}
 
@@ -615,7 +610,18 @@ public class ConferenceActivity extends ListActivity implements
 		}
 	}
 
-	
+	@Override
+	public boolean onKeyUp(int keyCode, KeyEvent event) {
+		if (LinphoneUtils.onKeyBackGoHome(this, keyCode)) return true;
+		return super.onKeyUp(keyCode, event);
+	}
+
+	@Override
+	public boolean onKeyDown(int keyCode, KeyEvent event) {
+		if (LinphoneUtils.onKeyVolumeSoftAdjust(keyCode)) return true;
+		return super.onKeyDown(keyCode, event);
+	}
+
 	/*
 	 * public int compare(LinphoneCall c1, LinphoneCall c2) { if (c1 == c2)
 	 * return 0;
diff --git a/src/org/linphone/DialerActivity.java b/src/org/linphone/DialerActivity.java
index b025baf2a..f81a701d8 100644
--- a/src/org/linphone/DialerActivity.java
+++ b/src/org/linphone/DialerActivity.java
@@ -37,6 +37,7 @@ import org.linphone.ui.HangCallButton;
 import org.linphone.ui.MuteMicButton;
 import org.linphone.ui.SpeakerButton;
 
+import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.Context;
@@ -47,6 +48,7 @@ import android.net.Uri;
 import android.os.Bundle;
 import android.os.PowerManager;
 import android.preference.PreferenceManager;
+import android.view.KeyEvent;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.TextView;
@@ -64,7 +66,7 @@ import android.widget.Toast;
  * </ul>
  *
  */
-public class DialerActivity extends SoftVolumeActivity implements LinphoneGuiListener, LinphoneManagerReadyListener, NewOutgoingCallUiListener, OnClickListener {
+public class DialerActivity extends Activity implements LinphoneGuiListener, LinphoneManagerReadyListener, NewOutgoingCallUiListener, OnClickListener {
 	
 	private TextView mStatus;
 	private View mHangup;
@@ -545,6 +547,11 @@ public class DialerActivity extends SoftVolumeActivity implements LinphoneGuiLis
 		}
 	}
 
+	@Override
+	public boolean onKeyDown(int keyCode, KeyEvent event) {
+		if (LinphoneUtils.onKeyVolumeSoftAdjust(keyCode)) return true;
+		return super.onKeyDown(keyCode, event);
+	}
 
 	@Override
 	public void onClick(View v) {
diff --git a/src/org/linphone/IncallActivity.java b/src/org/linphone/IncallActivity.java
index 734a7aa70..6874387b3 100644
--- a/src/org/linphone/IncallActivity.java
+++ b/src/org/linphone/IncallActivity.java
@@ -23,7 +23,7 @@ import java.util.TimerTask;
 
 import org.linphone.ui.HangCallButton;
 
-import android.content.Intent;
+import android.app.Activity;
 import android.os.Bundle;
 import android.os.Handler;
 import android.preference.PreferenceManager;
@@ -36,7 +36,7 @@ import android.widget.TextView;
  * @author Guillaume Beraudo
  *
  */
-public class IncallActivity extends SoftVolumeActivity implements OnClickListener {
+public class IncallActivity extends Activity implements OnClickListener {
 
 	public static final String CONTACT_KEY = "contact";
 	public static final String PICTURE_URI_KEY = "picture_uri";
@@ -132,16 +132,15 @@ public class IncallActivity extends SoftVolumeActivity implements OnClickListene
 		}
 	}
 
+	@Override
+	public boolean onKeyDown(int keyCode, KeyEvent event) {
+		if (LinphoneUtils.onKeyVolumeSoftAdjust(keyCode)) return true;
+		return super.onKeyDown(keyCode, event);
+	}
 
 	@Override
 	public boolean onKeyUp(int keyCode, KeyEvent event) {
-		if (event.getKeyCode() == KeyEvent.KEYCODE_BACK) {
-			startActivity(new Intent()
-			.setAction(Intent.ACTION_MAIN)
-			.addCategory(Intent.CATEGORY_HOME));
-			return true;
-		} else {
-			return super.onKeyUp(keyCode, event);
-		}
+		if (LinphoneUtils.onKeyBackGoHome(this, keyCode)) return true;
+		return super.onKeyUp(keyCode, event);
 	}
 }
diff --git a/src/org/linphone/SoftVolumeActivity.java b/src/org/linphone/LinphoneUtils.java
similarity index 51%
rename from src/org/linphone/SoftVolumeActivity.java
rename to src/org/linphone/LinphoneUtils.java
index af3cb5b25..a9c884892 100644
--- a/src/org/linphone/SoftVolumeActivity.java
+++ b/src/org/linphone/LinphoneUtils.java
@@ -22,37 +22,46 @@ import org.linphone.core.Log;
 import org.linphone.mediastream.video.capture.hwconf.Hacks;
 
 import android.app.Activity;
+import android.content.Intent;
 import android.view.KeyEvent;
 
 /**
- * Activity which handles softvolume.
+ * Helper to handle softvolume.
  * @author Guillaume Beraudo
  *
  */
-public class SoftVolumeActivity extends Activity {
+public final class LinphoneUtils {
+
+	private LinphoneUtils(){}
 
 	private static boolean preventVolumeBarToDisplay = false;
 
-	
-	public boolean onKeyDown(int keyCode, KeyEvent event) {
-		if ((keyCode == KeyEvent.KEYCODE_VOLUME_UP || keyCode == KeyEvent.KEYCODE_VOLUME_DOWN)
-				&& (Hacks.needSoftvolume() || LinphonePreferenceManager.getInstance(this).useSoftvolume())) {
-
-			if (!LinphoneService.isReady()) {
-				Log.i("Couldn't change softvolume has service is not running");
-				return true;
-			} else if (keyCode == KeyEvent.KEYCODE_VOLUME_UP) {
-				LinphoneManager.getInstance().adjustSoftwareVolume(1);
-			} else if (keyCode == KeyEvent.KEYCODE_VOLUME_DOWN) {
-				LinphoneManager.getInstance().adjustSoftwareVolume(-1);
-			}
+	public static boolean onKeyBackGoHome(Activity activity, int keyCode) {
+		if (!(keyCode == KeyEvent.KEYCODE_BACK)) {
+			return false; // continue
 		}
-		
-		if (!preventVolumeBarToDisplay) {
-			return super.onKeyDown(keyCode, event);
-		} else return true;
+
+		activity.startActivity(new Intent()
+			.setAction(Intent.ACTION_MAIN)
+			.addCategory(Intent.CATEGORY_HOME));
+		return true;
 	}
 
+	public static boolean onKeyVolumeSoftAdjust(int keyCode) {
+		if (!((keyCode == KeyEvent.KEYCODE_VOLUME_UP || keyCode == KeyEvent.KEYCODE_VOLUME_DOWN)
+				&& Hacks.needSoftvolume())) {
+			return false; // continue
+		}
 
+		if (!LinphoneService.isReady()) {
+			Log.i("Couldn't change softvolume has service is not running");
+			return true;
+		} else if (keyCode == KeyEvent.KEYCODE_VOLUME_UP) {
+			LinphoneManager.getInstance().adjustSoftwareVolume(1);
+		} else if (keyCode == KeyEvent.KEYCODE_VOLUME_DOWN) {
+			LinphoneManager.getInstance().adjustSoftwareVolume(-1);
+		}
+		return !preventVolumeBarToDisplay;
+	}
 }
 
diff --git a/src/org/linphone/VideoCallActivity.java b/src/org/linphone/VideoCallActivity.java
index 9474ada03..102fce001 100755
--- a/src/org/linphone/VideoCallActivity.java
+++ b/src/org/linphone/VideoCallActivity.java
@@ -26,6 +26,7 @@ import org.linphone.mediastream.video.AndroidVideoWindowImpl;
 import org.linphone.mediastream.video.capture.AndroidVideoApi5JniWrapper;
 import org.linphone.mediastream.video.capture.hwconf.AndroidCameraConfiguration;
 
+import android.app.Activity;
 import android.content.Context;
 import android.hardware.Camera;
 import android.hardware.Camera.CameraInfo;
@@ -34,6 +35,7 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.PowerManager;
 import android.os.PowerManager.WakeLock;
+import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
@@ -48,7 +50,7 @@ import android.widget.ImageView;
  * @author Guillaume Beraudo
  *
  */
-public class VideoCallActivity extends SoftVolumeActivity {
+public class VideoCallActivity extends Activity {
 	private SurfaceView mVideoViewReady;
 	private SurfaceView mVideoCaptureViewReady;
 	public static boolean launched = false;
@@ -271,6 +273,11 @@ public class VideoCallActivity extends SoftVolumeActivity {
 		return true;
 	}
 
+	@Override
+	public boolean onKeyDown(int keyCode, KeyEvent event) {
+		if (LinphoneUtils.onKeyVolumeSoftAdjust(keyCode)) return true;
+		return super.onKeyDown(keyCode, event);
+	}
 
 	@Override
 	protected void onDestroy() {

From 16d02ef317f8f6432ec0629af4f557911ae16027 Mon Sep 17 00:00:00 2001
From: Guillaume Beraudo <guillaume.beraudo@belledonne-communications.com>
Date: Fri, 30 Sep 2011 14:36:19 +0200
Subject: [PATCH 14/62] Close button below dtmf dialpad on conference activity.

---
 res/values/strings.xml                   |  2 ++
 src/org/linphone/ConferenceActivity.java | 14 +++++++-------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index f923f6094..020dafc25 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -10,6 +10,8 @@
 
 	<string name="skipable_error_service_not_ready">Warning: service is not ready</string>
 
+	<string name="close_button_text">Close</string>
+	
 	<string name="status_conf_call">conf</string>
 	<string name="status_active_call">active</string>
 	<string name="state_paused">paused</string>
diff --git a/src/org/linphone/ConferenceActivity.java b/src/org/linphone/ConferenceActivity.java
index 874d524e1..eadcdf593 100644
--- a/src/org/linphone/ConferenceActivity.java
+++ b/src/org/linphone/ConferenceActivity.java
@@ -178,13 +178,13 @@ public class ConferenceActivity extends ListActivity implements
 					getLayoutInflater().inflate(R.layout.numpad, null))
 			// .setIcon(R.drawable.logo_linphone_57x57)
 					// .setTitle("Send DTMFs")
-					// .setPositiveButton("hide", new
-					// DialogInterface.OnClickListener() {
-					// public void onClick(DialogInterface dialog, int whichButton)
-					// {
-					// dismissDialog(id);
-					// }
-					// })
+					 .setPositiveButton(getString(R.string.close_button_text), new
+					 DialogInterface.OnClickListener() {
+					 public void onClick(DialogInterface dialog, int whichButton)
+					 {
+					 dismissDialog(id);
+					 }
+					 })
 					.create();
 		default:
 			throw new RuntimeException("unkown dialog id " + id);

From 0db97c80efce153abb20b1d8aafb21a0c82a466a Mon Sep 17 00:00:00 2001
From: Guillaume Beraudo <guillaume.beraudo@belledonne-communications.com>
Date: Fri, 30 Sep 2011 15:08:31 +0200
Subject: [PATCH 15/62] Show merge button in conference more often.

---
 src/org/linphone/ConferenceActivity.java | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/org/linphone/ConferenceActivity.java b/src/org/linphone/ConferenceActivity.java
index eadcdf593..5d43b46b6 100644
--- a/src/org/linphone/ConferenceActivity.java
+++ b/src/org/linphone/ConferenceActivity.java
@@ -133,8 +133,7 @@ public class ConferenceActivity extends ListActivity implements
 	public void onResumeWhenManagerReady() {
 		registerLinphoneListener(true);
 		updateConfState();
-		boolean showSimpleActions = lc().getConferenceSize() == 0 && lc().getCallsNb() == 2;
-		findViewById(R.id.conf_simple_merge).setVisibility(showSimpleActions ? VISIBLE : GONE);
+		updateMergeButtonState();
 	}
 
 	@Override
@@ -529,6 +528,13 @@ public class ConferenceActivity extends ListActivity implements
 
 	private Handler mHandler = new Handler();
 
+	private void updateMergeButtonState() {
+		int callNb = lc().getCallsNb();
+		int confSize = lc().getConferenceSize();
+		if (lc().isInConference()) confSize--;
+		boolean showSimpleActions = callNb >= 2 && confSize != callNb;
+		findViewById(R.id.conf_simple_merge).setVisibility(showSimpleActions ? VISIBLE : GONE);
+	}
 	public void onCallStateChanged(final LinphoneCall call, final State state,
 			final String message) {
 		final String stateStr = call + " " + state.toString();
@@ -537,8 +543,7 @@ public class ConferenceActivity extends ListActivity implements
 			public void run() {
 				CalleeListAdapter adapter = (CalleeListAdapter) getListAdapter();
 				Log.d("ConferenceActivity applying state ",stateStr);
-				boolean showSimpleActions = lc().getConferenceSize() == 0 && lc().getCallsNb() == 2;
-				findViewById(R.id.conf_simple_merge).setVisibility(showSimpleActions ? VISIBLE : GONE);
+				updateMergeButtonState();
 				if (state == State.IncomingReceived || state == State.OutgoingRinging) {
 					if (!adapter.linphoneCalls.contains(call)) {
 						adapter.linphoneCalls.add(call);

From 4fbabf8e838862982a757e106ecd816fa4358b55 Mon Sep 17 00:00:00 2001
From: Guillaume Beraudo <guillaume.beraudo@belledonne-communications.com>
Date: Fri, 30 Sep 2011 15:56:05 +0200
Subject: [PATCH 16/62] Fix: create wait dialog in conference activity.

---
 src/org/linphone/ConferenceActivity.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/org/linphone/ConferenceActivity.java b/src/org/linphone/ConferenceActivity.java
index 5d43b46b6..6bf4f9663 100644
--- a/src/org/linphone/ConferenceActivity.java
+++ b/src/org/linphone/ConferenceActivity.java
@@ -171,6 +171,10 @@ public class ConferenceActivity extends ListActivity implements
 	}
 	@Override
 	protected Dialog onCreateDialog(final int id) {
+		if (id == LinphoneManagerWaitHelper.DIALOG_ID) {
+			return waitHelper.createWaitDialog();
+		}
+
 		switch (id) {
 		case numpad_dialog_id:
 			return new AlertDialog.Builder(this).setView(

From b3f7a208574b6f4e1559a9130f0bf3808b59cf50 Mon Sep 17 00:00:00 2001
From: Guillaume Beraudo <guillaume.beraudo@belledonne-communications.com>
Date: Mon, 3 Oct 2011 16:33:59 +0200
Subject: [PATCH 17/62] Initial support for contact picture retrieving

Search for
- custom im 'sip' from username@domain;
- then android sip from username@domain;
- then number from username
---
 AndroidManifest.xml                           |   3 +-
 res/drawable-hdpi/unknown_person.png          | Bin 0 -> 4619 bytes
 res/drawable-ldpi/unknown_person.png          | Bin 0 -> 5539 bytes
 res/drawable-mdpi/unknown_person.png          | Bin 0 -> 2521 bytes
 res/drawable/unknown_person.png               | Bin 812 -> 5539 bytes
 res/layout/conferencing.xml                   |  11 +-
 res/layout/incoming.xml                       |   5 +
 .../AbstractContactPickerActivity.java        |   2 +
 src/org/linphone/ConferenceActivity.java      |  38 +++++-
 .../linphone/ContactPickerActivityNew.java    | 112 ++++++++++++++----
 .../linphone/ContactPickerActivityOld.java    |   5 +
 src/org/linphone/DialerActivity.java          |   7 +-
 src/org/linphone/IncomingCallActivity.java    |  12 ++
 src/org/linphone/LinphoneUtils.java           |  58 ++++++++-
 src/org/linphone/ui/HangCallButton.java       |   9 +-
 15 files changed, 233 insertions(+), 29 deletions(-)
 create mode 100644 res/drawable-hdpi/unknown_person.png
 create mode 100644 res/drawable-ldpi/unknown_person.png
 create mode 100644 res/drawable-mdpi/unknown_person.png

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 2228c435e..5f3d7662b 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -61,7 +61,8 @@
             </intent-filter>
          </activity>
 		<activity android:name="org.linphone.ConferenceActivity"
-        			android:theme="@android:style/Theme.NoTitleBar.Fullscreen">
+        			android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
+        			android:screenOrientation="portrait">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
             </intent-filter>
diff --git a/res/drawable-hdpi/unknown_person.png b/res/drawable-hdpi/unknown_person.png
new file mode 100644
index 0000000000000000000000000000000000000000..0e517993259cd47352c32d642093b4e06bede319
GIT binary patch
literal 4619
zcmV+m67=nfP)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2ipn*
z4KoE`@$>Hh01=BxL_t(|+RdD6kX&_{#(&T0o=he;Ndku42uk-r0zm~gT6m#A1d+9@
z+FhZ$BWvxhTB~dAXUp3M#j5?fTV-w4uHpxwdtkR*g+&C5UD2#^33md?Oe2I4BLYH5
zCc|9%Jp1AQKi#M2LMEhV$f=sjbm#P${y*n^pZ9&A_x&Hy!(-%{ov0-#mCw2RN8!C{
zm2#uONUd7LUTKsFQoxdA`?%MYWP@ZUmQw5^<wj#FyEZ_xR>QVzdvIu|XKPZgF4Vl{
zvy|?*X?EbM6(JHEj3^`t*w{uo{#UR~k|eb3a1jaHX}Qtx?0>HV+{qrrUIA3P<0hI{
zUQa1nPS*mZmB1F^GXzCittlso=K~HA#57GMsR&E~F9G|3*B26;o&p3=y8A~wbJg_#
zoO4$fQ0suJ3>OQQSsDW-9j)Ow{)KF?`;Z2ZjsXt=Kg|O)T&*Izr{MG)pl7bSo^$T{
z5yM})wtJ1H1YByk99RatA$ww8{slPj)shsJVjq*V0@wqL<bf<V8a=ll(c|Os)`z*U
zu#4f(RhBZv3Z;6NtWN?vEtio{STvfC1w{^0;GOU<3}e@A{|tB*>BwNCG0p-U#a>_V
z!on^da2b7$EjE_`I}q=~UI)S<Y)R6*z##`thAXh%_SKTk1n!r#3urC`K*@=I;E8W+
z%Kg5P$G^ET{QlL`+wUJ?1k6U@3g9!q2aHw;thU$S`PsOL=(z21_DUtm2Y}BQK4yCZ
z3v`??K-+J4fhWJYi6_6Y352lq_*d7k{hwZLpYt&R)^cDIu$ne7A)7&R7Ut*UUIc4v
ze=Y+}_Uc61AgMq9nc-@+9nlsYpd5D<fj*#5h5q(+9!lSnEvyB!a&Cc9MtaJ)Xr2}n
zezV&bvn{05Fkv{F|HxpY!EmM06S9750EHW0!1Mt{O9g-@zqN^rlgF}iCJA3W&732U
zvypAjlc0k!28*%O4t$ZU4UDyu)mp9R(dSJ8+WU<yU9X@1T6mo%DQS|L1d=2nNfMs;
z=0+~~_6wa0r-_p^asGVEl9eDO$}#V8L%c0XiR>g~4Z)@qepU&}Bh~7L6pGDiRn1C;
za*xW5H;rQF-LRj%Uq36}LD>4;{h5DY-0C<Ft?l1A$P?e%#P$p%b!au7uNk*?9(j<W
zJGR{|_nRTXJ{!13fv6t_9y7eScqARnTQb`FwJn_+Yg&lO=t?Qj0Vjs%{K<1fEuW}!
zcL>cG62lhYQ-;4r`Z#c=dYIo8=MzOFVL4kU+rNFVYk^P3P@g~2BmxV_3W<-gWe1B2
z9&&;!$=JvW1+Q!u4TU60&Ld6tI%L^;3*euG1;xB&+YJYJ`s<r#oN~c;4$l0TT@)-w
zN-}G*vdka?$BEldC(Dcrh{SChlBA#>R|m!8k@R^t>~Ft*>g$`?`rQL3k_sf)?aHEk
zTP45MKohUwt~@F5R113yX!R1I<ai{VKeo*u91O>R-vfv9WE`zWZ^{0%%LLHXuJ%Jt
zl^UkpBiCB6S}b>`4;g+bX-sK)KGHe1*Cv5jPwLVc-kzCEzWt@f2>^6JaJ%gvSh@pv
zfpC{+i(V(SI_EO%QyQSG_G#8?lp2k(a-;EwsnOBj#@ysjGpVHgBTmtyrvQ~34Mr*z
zQk!PA%D(HaW7}=FfixcLwgTOGj8EEpV!qk4xW14aG?$tudl@j`tcx+N4$A;*OB-`%
z*t1n|b|CFj-^FGFXSh;HA|!`_$vh~E3v&QvK5dSSj$^f(b5AXdmlhY=hhxTj2-p?X
z!7}!GU`cG>xZU@f-9l#1B0_f9RvfVlhJN+<rY8#xP$AT5O~H?mZgiUdFTt8ZrQXq}
zoy&8&e%w(KJC@`uMU1kCBuV`~`7~m2E$H3#I)n)Jr)I78Jkm1Y0^p1+Vay9*S*z7K
zK~0@(xua1l+Fkn;j{~C$BHgJEP;3Q<uBb$*(V$eXA8yuaPuTu7LEG5^tjSWpD59mA
zh2$lX%*w28k}`}dG!pk=KZ^8fF9X_wyBI(z_N(H8MzH_W_78#IAdThRD4#fna>7ot
zaw6j=+c-^85Yr9`ZbSNkq&p3VEcFbaMNQE1X~1x$vPsfTq%X)mC*zZ7B^_7lP6Hfy
zOAZz|3ET^OPtskbdVQ?RimO#hC#g#p7Xz4PwTh>;g;gm0fmZ8LNxzNS&>6r|Ltj@z
z(GH3xjAFk8yoyw?y&{obL)r~IU8>i|nzb6Gz<G>RDklxjq5(9kx++Z}J!$(ELJRp4
z**h$)ZtF++;2(JAS5a0yDruPmA&+3c2(-bOr<!}}xmerPYBfqW>TuIG?3$$O4QI8h
z^-hk1?T3{lKS<%H3H$+jAhr7?O;|cMSg*I<ESo>&Ehsbl^3V|FoEwxI4TfvAXORv8
zlWptC%e}!Qj$t1fY&0_Y@+i4}SQZ3&J>8Kk76&z})fugr_G=r#M2t$aYCDD&(i<7D
z^inT*y8+6()*ODG2nL*28fO+AMeKnL*y-0AY&6>AFFn?^7WZgYt4j?lB`q-=!=406
zhKisj*qqOzbD8#|z)gmqB+~P?r{)^L8?ICs92)8gA1z8IJvcN(E(EU!F2Q~mAqu?#
ztd;a$V7cvf>5)aF80O!JeVJf6VZ!Wz7};hVy#i<P@}OLPg7j|Np9DS(ECG&0vEm)J
zSLSq~tS6s2+&h8G1lxcOz{_(1)Jsm%VuCYVt!_-DYi)mC(zcEi)DG*4Bf`oH^3kHC
zjv(@o?SBPsll_WexnW5ny<usrT(75jS39Ku8mU%sB+VQ-p9WkAydV2g!AESbo}ns+
zDn2DAre!^}Yz8_>5&?&7-wiw%U39sm3GBUw-Q`B(=zIf4IhR~6ii>60??|<Zq+mT^
zz~Ixsm4?m0ij0Wev5?ulBm;^#$PoU<X-Jm}F0@_5UT*0n;Aev0F>PLGHWJqfjNkO^
z7_L?sY&00D)jG*wwYpN$r?LORup^gRc((7LZ2ByVWO1g^vAvvR1#FaD9a01lnufQ_
z{vOh<Qll|GT&XNgq`q)b5VX=XofsS%nw*s%7Yd-+{>X5(x)eB9(tBd`xysUd$1*(L
zJ>@g!yhUa17D1A;N<VN>4!e%UN!o*b8}PVcoG@}+1eU~%{1w@IN{z<wbXt&2X%@ap
z7J`%`^6LfHVE-NP31Dp|)O(r?pC{zmW~y=%X6?Bv&vK^?8<DO-`g`Cjz!wCc7kt_F
zmj%}vwl{0FLgs1<?qYd&$|ZwK3|APwBDkDTRD$F*loeUzYB|(jsiLl&+DQThOGQP?
z$yKgInO5y=yR#5SLQix2m5FS{SkE00{LuD|<wj%wjGJ4j%&;Q$GI~jRM;vI{3Va0n
z&w;aK<0NTkHBs<N1qUq+N1bOvQlIVBg0qp%2Kt@JuURz9B3za$<*cs@v`E7F0d!#0
z_Pvt+8~YJpzu}MNMx(XhQ7mq4+F<)rlCA<uQ3O*ek;I(Gotx6K)Fe%RjPwLBn%V<`
zGSVk(p9%Em+%VIr)sB4XO!avhFw+3b-dze@>@;1Cv`x~T3X0_D!iV{AS62zn1$L0l
zE{C?K+9Fn(W?%j=u*cH9gN??XoFyK#Js8{7ZHtHmp0RW4Fb|Z{-P=zj6*7oCgQ6$^
z>yXw7RvShH|F<aBe3<O@Q9=*wVc<pVslclt>xencQAzuN{{imDem<|~NP0y<`$;n$
zI-3V_XQ8hOo&<g=xEuI6(yxHw7`^0<(BJOeN1Z$Cr=21D9TBueNfZqnM7kY#2K&R3
zuC{%ax`)P_w(r2+C3sp%ax^b=+3q(Kb8~jetBbKV`MvFX1P@wzDZ1Y~9g@e>u?O18
zXReGva@XkJJapM&FT#4MUeCm@*MLWwmC92{uVKGSus%)GB}tM1j3GTOxO*~9f4%kA
zTRlCGQpjEUvUTLAHe#Y^;1%FOC&}%DH{U!Kudzx&^nbtMbV&u-Er*V5lC`RxwXETF
zOGjeuw{R|2s@J<F++(O5N7`rU0mE)d&j3xN`>-EEdS>gbw>ry1x{^$3Lef-wdruaD
zItgSpUH{_X%{Pw?*J?rIuGe2T>^0nv^r-D84EGBj$<0j*7`3$5(ywLj$DUen7t1Gi
zxjf>J*!KX>0;}S}UPIcK21}c@(zbn6(!{ilE8U?y-1P~7!3b{DpPmQq5Il-B6${z*
z4uj@rB3bqx!)@5Rfqf3=EG$47f8<3f1;TzXwI3y$iI!4H6He3dIm;AjS!(x*Y_xhN
z(JAOir*-{Dns!=4QZa3{M*I8wr=}(+%aS(R{xfibc!bnHDGv>`Bj+Rk_;KF%FTbE!
z-ASo&^TNv=^XV>hZRy^*6I!i)OKT)ug#DKe)&J_w#AbW9^OU4VQu|iyyCpq`bTrd|
zrXTyRyKZTrP^cO2wA}|ZB;8o9H^$r2Y-K0NlpFQMlRM^XbpWYdlyttN%WPjPX}e&c
zYfo9H9i3ormh?$rBk&vGmvgC$Q73u~kpKlr564N6wu`^n_+D>E@ZRb!8@u1Za{daq
z$o3M24RmB0b<W&nX`StLNhoPn0ME<?P$H$a_gdN?F&@i1PP6h^N<%lr8nQ-dniajR
z)1}Qyr9hJO+kP+7X9d?gO;;#Mvbn=_`b>1J!xT?2(r(-TCg~Tpk07li)cr?oA1*f<
zvqq_ro!5~r8O4Pu&inq)-~O(~tg=YxY<vi52lfXo4RqE{zLpXlJ*d6oFp~HtNmtn3
zNXU7X1BVT}1^30Kz>Fg;PRvW*U-%itx%p_Rr3<k?16(3$RcZ%yu){mq@Km?T*d5W<
z0GHYRfTRIn0O<gB5qN4YfLxda#ChMpYw;x4xq49})oLHo3haKu9*zm%Y@j0P^T5Wo
zabzlDcjHi5eMP5{7?Wam3gJ%Plv?^P+5c{|OXe8Dd4AdV#mi_#7d!u-A6^^_%38nE
zyBbKR10ReM2=Va}Yk(ctYo_0<94MKbJX_tTY!F?UF?FW(672I0e<9dlctEf>HY(Zs
z#U0=jwff@LwYQ_IQLCX&8L=6-61ZHj%=TyyNVFR0Q}+ehd(@^sok2O*%Z26~EyY??
zLTP%Ar89s*K_BKI@Y+bNN~^dBQY)ES<}@uXqKm~apO;~q)#@5cpB8+{_WM1vjgcvg
zndW2V_{N=f&txneCTtgx24pWGO0}_ObEaL>p1#*%>{~2uOp|o?xi{a^0@(M34<Vbu
z@Be1u0h*($F#ud3=_1)5Mf#ZSb(y}S>5^&w3+0KuBU`*`dv_u|i@nycL(=A))jE@6
z9YneICO)jkEZ=K+x2(s|RI^<Fk7M&$+d_6VHpH&R-&(p7do3MObysI1zX5o<w%j@A
zW!d)_eu(r_r03|~_mStYOoYx9-mO3t_#4ZYn8J$rt|#e5<jPx5sa~g9t@b0G4_pGg
z7dSogot5K^DAbQ4y$-xCIHC}ik63ygdn_(~iqJ8As9dk#XZu0yy+}u5)Othqk@#Gq
zDdiLZV=ONL&XBc5)*4xb`L3_ni^!Er3|B=$-irNENrOONM%=llD1;gbo=ekoMAFNV
zOZsvT3?PMK0t1nM9x^-^t?ZAa>3xz0Y%iBIYADD)%hDjy>G5yKc*6FpLNCaA%rGLo
zxx}%MqWyZ?R|8idoohI=%k;B$O>nhwq^E$}4SNKwxY$Cz7jL_u@QjX^6{lH&qe<8t
z^Se;%`WVt_sdTAA-+nEf2gr>g?!(*(Jd8MSyx#png?Rz11s4e}wY_w<T;8^l@a7b7
z0Jv|k(RdnQU$t5&bf!AGc{?aRVe%tQCt6aoVE;}@(kj*K9;wy(1#6KmpVpoo7upBh
zQyQwbpE1<DwnpjJ`mBx51pz2_OpAgQNc~PzXOET0ZFeG9G8h<l?m1-VzDWab7R4YX
zrzZ=>ZI4Fa$?;GsG?prq9L-9N(oh|W92Xpb{|B$RF<5)HEbIUP002ovPDHLkV1jUO
B%o_jz

literal 0
HcmV?d00001

diff --git a/res/drawable-ldpi/unknown_person.png b/res/drawable-ldpi/unknown_person.png
new file mode 100644
index 0000000000000000000000000000000000000000..4425150f288d423128b55612a04896c6d0d1df15
GIT binary patch
literal 5539
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

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi/unknown_person.png b/res/drawable-mdpi/unknown_person.png
new file mode 100644
index 0000000000000000000000000000000000000000..ed45aedcdc9139fbf4befb7af9131d5c31375fef
GIT binary patch
literal 2521
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

literal 0
HcmV?d00001

diff --git a/res/drawable/unknown_person.png b/res/drawable/unknown_person.png
index ac5ea1616e1376b5e59c05023e1ad10d822b7742..d665151871b05cf3e4f34a3e378f93e9bf272e36 100644
GIT binary patch
literal 5539
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

delta 785
zcmV+s1Md8zE35_~iBL{Q4GJ0x0000DNk~Le0000P0000N2nGNE0RH3T6Okb)e+}0F
z01ejxLMWSf00007bV*G`2iph}4JsO3AXEJS00OK@L_t(Y$F-GDZxTTm#-De#>{d!`
zJQ#><HEE%iuF;F<egPA2CWcSo)l)UGWJQh9qeqh_o;J~g-=GK4gBLHhTQGu&7SdLm
z)Re}u1!g=93+%GM*2Fo@u*3U%f8M_X{HOKBywKfGg!w}`n-#;pr7Vlw{q|iQ^_YMl
zLW}qA&?w`jwVRQN_1MWc5zU2n#03D+Gp9CNNI%^T_Cx@%bNckeOrox;XPX>+tf!pQ
zfDsok04Y7V#I{(Q6HsT7DKIq#j>EAKt-LIpRG~*AFO<0(dsRo9wWVw&e*#jYAZ_ZO
zlFnP+01*Hb?<c_{eL|w=uyk)DRN~#`@dN_Y=2&{N)AOVs05;PF6wM?ybIEY>h45$>
z3WIH)mnOH&qz7P_HtgIi?3@nH2?X+~3|_{g8o<0D2u+$5ow5^v1gy?>PNTx%OMF~@
zGt8Q|D+Ewny$I&o)7WH3f50H%csC9sU&Z`_MSif8D$wCHP+6Ii9_6<^COG3@uIjW|
z9vX`4FF#4X8PHUn)zD60n}+;Z5uQ72u<3ngM%@bYSD98>_PX7cJtf12!Dg(i%whi7
zHyHWtQ_U`|EJ04HK!o6H-DYf@aZWuP{V=t%EQ0QL6Aw-hZ*GkQf21sn`loKFsZ9Wj
zDxHXtg7W_1&@n#Dc*?SfW<L%G6O&oq%;``jr=i9(&=O0~Z#)jI)DJIbvz}pT<f}3#
zSMpUbH3m|r05yuApWmXs^EFhC`p+At?rmBYP_N%#-$5jiff`?gn#h3vIY8rA5s7QJ
zLlr?kpv@RvHGhb}XP2?|VGWbX%TVJPH1|q4*(>4b#kvSP=ACqbl;Z|1KHnE(pWmb3
zRXBTFIC%I<j8g9Q$*_VM`^Njj<D}mcgy_6{0we$~1dLJ*m596>RE2*5Vf`5pU^p0s
P00000NkvXXu0mjf2AXM>

diff --git a/res/layout/conferencing.xml b/res/layout/conferencing.xml
index 61791955b..42781aeb8 100644
--- a/res/layout/conferencing.xml
+++ b/res/layout/conferencing.xml
@@ -54,6 +54,15 @@
 			android:layout_width="wrap_content" android:layout_height="wrap_content" />
 	</LinearLayout>
 
+	<FrameLayout android:id="@+id/incall_picture_box" android:layout_above="@id/conf_simple_actions"
+			android:layout_height="wrap_content" android:layout_width="wrap_content"
+			android:layout_centerInParent="true">
+		<ImageView android:id="@+id/incall_picture" android:visibility="gone"
+			android:layout_height="wrap_content" android:layout_width="wrap_content" 
+			android:layout_gravity="center" android:scaleType="fitCenter"
+			android:padding="10sp" android:minWidth="288px" android:minHeight="288px"
+			android:paddingBottom="50sp" />
+	</FrameLayout>
 
      <ListView android:id="@android:id/list"
                android:layout_width="fill_parent"
@@ -62,7 +71,7 @@
                android:dividerHeight="10dip"
                android:divider="@android:color/transparent"
                android:layout_below="@id/conf_header"
-               android:layout_above="@id/conf_simple_actions"
+               android:layout_above="@id/incall_picture_box"
                android:layout_alignWithParentIfMissing="true"
                android:fadeScrollbars="false"
      />
diff --git a/res/layout/incoming.xml b/res/layout/incoming.xml
index 4b0f71816..aab32ea21 100644
--- a/res/layout/incoming.xml
+++ b/res/layout/incoming.xml
@@ -13,6 +13,11 @@
 	<LinearLayout android:layout_width="wrap_content"
 		android:layout_height="wrap_content" android:orientation="vertical"
 		android:layout_centerInParent="true">
+		<ImageView android:id="@+id/incoming_picture"
+			android:layout_height="wrap_content" android:layout_width="wrap_content" 
+			android:layout_gravity="center" android:scaleType="fitCenter"
+			android:minWidth="288px" android:minHeight="288px"
+			android:paddingBottom="10sp"/>
 		<TextView android:id="@+id/incoming_caller_name"
 			android:layout_width="wrap_content" android:layout_height="wrap_content"
 			android:text="Caller name" android:textAppearance="?android:attr/textAppearanceLarge"
diff --git a/src/org/linphone/AbstractContactPickerActivity.java b/src/org/linphone/AbstractContactPickerActivity.java
index ebc309679..4e0b4949a 100644
--- a/src/org/linphone/AbstractContactPickerActivity.java
+++ b/src/org/linphone/AbstractContactPickerActivity.java
@@ -21,6 +21,8 @@ package org.linphone;
 import java.util.Collections;
 import java.util.List;
 
+import org.linphone.mediastream.Version;
+
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.DialogInterface;
diff --git a/src/org/linphone/ConferenceActivity.java b/src/org/linphone/ConferenceActivity.java
index 6bf4f9663..8d815a4c4 100644
--- a/src/org/linphone/ConferenceActivity.java
+++ b/src/org/linphone/ConferenceActivity.java
@@ -41,6 +41,7 @@ import android.app.ListActivity;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.res.Resources;
+import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
 import android.text.TextUtils;
@@ -51,6 +52,7 @@ import android.view.WindowManager;
 import android.view.View.OnClickListener;
 import android.widget.ArrayAdapter;
 import android.widget.BaseAdapter;
+import android.widget.ImageView;
 import android.widget.ListAdapter;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -132,6 +134,7 @@ public class ConferenceActivity extends ListActivity implements
 	@Override
 	public void onResumeWhenManagerReady() {
 		registerLinphoneListener(true);
+		updateCalleeImage();
 		updateConfState();
 		updateMergeButtonState();
 	}
@@ -164,6 +167,23 @@ public class ConferenceActivity extends ListActivity implements
 		super.onPause();
 	}
 
+	private void updateCalleeImage() {
+		ImageView view = (ImageView) findViewById(R.id.incall_picture);
+		LinphoneCall currentCall = lc().getCurrentCall();
+
+		if (lc().getCallsNb() != 1 || currentCall == null) {
+			view.setVisibility(GONE);
+			return;
+		}
+
+		Uri picture = LinphoneUtils.findPictureOfContact(
+				getContentResolver(),
+				currentCall.getRemoteAddress().getUserName(),
+				currentCall.getRemoteAddress().getDomain());
+		LinphoneUtils.setImagePictureFromUri(view, picture, R.drawable.unknown_person);
+		view.setVisibility(VISIBLE);
+	}
+
 	private void enableView(View root, int id, OnClickListener l, boolean enable) {
 		View v = root.findViewById(id);
 		v.setVisibility(enable ? VISIBLE : GONE);
@@ -418,15 +438,15 @@ public class ConferenceActivity extends ListActivity implements
 			final LinphoneCall.State state = call.getState();
 
 			String mainText = call.getRemoteAddress().getDisplayName();
-			String complText = call.getRemoteAddress().getUserName();
+			String username = call.getRemoteAddress().getUserName();
 			TextView mainTextView = (TextView) v.findViewById(R.id.name);
 			TextView complTextView = (TextView) v.findViewById(R.id.address);
 			if (TextUtils.isEmpty(mainText)) {
-				mainTextView.setText(complText);
+				mainTextView.setText(username);
 				complTextView.setVisibility(View.GONE);
 			} else {
 				mainTextView.setText(mainText);
-				complTextView.setText(complText);
+				complTextView.setText(username);
 				complTextView.setVisibility(View.VISIBLE);
 			}
 
@@ -510,6 +530,17 @@ public class ConferenceActivity extends ListActivity implements
 				}
 			});
 
+			ImageView pictureView = (ImageView) v.findViewById(R.id.picture);
+			if (numberOfCalls != 1) {
+				String domain = call.getRemoteAddress().getDomain();
+				// May be greatly sped up using a drawable cache
+				Uri uri = LinphoneUtils.findPictureOfContact(getContentResolver(), username, domain);
+				LinphoneUtils.setImagePictureFromUri(pictureView, uri, R.drawable.unknown_person);
+				pictureView.setVisibility(VISIBLE);
+			} else {
+				pictureView.setVisibility(GONE);
+			}
+
 			return v;
 		}
 	}
@@ -548,6 +579,7 @@ public class ConferenceActivity extends ListActivity implements
 				CalleeListAdapter adapter = (CalleeListAdapter) getListAdapter();
 				Log.d("ConferenceActivity applying state ",stateStr);
 				updateMergeButtonState();
+				updateCalleeImage();
 				if (state == State.IncomingReceived || state == State.OutgoingRinging) {
 					if (!adapter.linphoneCalls.contains(call)) {
 						adapter.linphoneCalls.add(call);
diff --git a/src/org/linphone/ContactPickerActivityNew.java b/src/org/linphone/ContactPickerActivityNew.java
index c15789da8..8aff6361b 100644
--- a/src/org/linphone/ContactPickerActivityNew.java
+++ b/src/org/linphone/ContactPickerActivityNew.java
@@ -23,12 +23,14 @@ import java.util.List;
 
 import org.linphone.mediastream.Version;
 
+import android.content.ContentResolver;
 import android.content.ContentUris;
 import android.content.Intent;
 import android.database.Cursor;
 import android.net.Uri;
 import android.provider.ContactsContract;
 import android.provider.ContactsContract.Contacts;
+import android.provider.ContactsContract.PhoneLookup;
 import android.text.TextUtils;
 
 
@@ -52,19 +54,27 @@ public class ContactPickerActivityNew extends AbstractContactPickerActivity {
 
 	@Override
 	public Uri getPhotoUri(String id) {
-		Uri contactUri = ContentUris.withAppendedId(Contacts.CONTENT_URI, Long.parseLong(id));
+		return retrievePhotoUri(getContentResolver(), Long.parseLong(id));
+	}
+
+	private static Uri retrievePhotoUri(ContentResolver resolver, long id) {
+		Uri contactUri = ContentUris.withAppendedId(Contacts.CONTENT_URI, id);
 		Uri photoUri = Uri.withAppendedPath(contactUri, Contacts.Photo.CONTENT_DIRECTORY);
 		if (photoUri == null) {
 			return null;
 		}
-		Cursor cursor = getContentResolver().query(photoUri,
-				new String[]{ContactsContract.CommonDataKinds.Photo.PHOTO}, null, null, null);
+		String[] projection = {ContactsContract.CommonDataKinds.Photo.PHOTO};
+		Cursor cursor = resolver.query(photoUri, projection, null, null, null);
 		try {
 			if (cursor == null || !cursor.moveToNext()) {
 				return null;
 			}
 			byte[] data = cursor.getBlob(0);
 			if (data == null) {
+				// TODO: simplify all this stuff
+				// which is here only to check that the
+				// photoUri really points to some data.
+				// Not retrieving the data now would be better.
 				return null;
 			}
 			return photoUri;
@@ -78,9 +88,10 @@ public class ContactPickerActivityNew extends AbstractContactPickerActivity {
 	protected List<String> extractPhones(String id) {
 		List<String> list = new ArrayList<String>();
 		Uri uri = ContactsContract.CommonDataKinds.Phone.CONTENT_URI;
+		String[] projection = {ContactsContract.CommonDataKinds.Phone.NUMBER};
 		String selection = ContactsContract.CommonDataKinds.Phone.CONTACT_ID + " = ?";
 		String[] selArgs = new String[] {id};
-		Cursor c = this.getContentResolver().query(uri,	null, selection, selArgs, null);
+		Cursor c = this.getContentResolver().query(uri, projection, selection, selArgs, null);
 
 		int nbId = c.getColumnIndex(ContactsContract.CommonDataKinds.Phone.NUMBER);
 
@@ -96,35 +107,41 @@ public class ContactPickerActivityNew extends AbstractContactPickerActivity {
 	protected List<String> extractSipNumbers(String id) {
 		List<String> list = new ArrayList<String>();
 		Uri uri = ContactsContract.Data.CONTENT_URI;
+		String[] projection = {ContactsContract.CommonDataKinds.Im.DATA};
 		String selection = new StringBuilder()
-		.append(ContactsContract.Data.CONTACT_ID).append(" =  ? AND ")
-		.append(ContactsContract.Data.MIMETYPE).append(" = ? ")
-		.append(" AND lower(")
-		.append(ContactsContract.CommonDataKinds.Im.CUSTOM_PROTOCOL)
-		.append(") = 'sip'").toString();
-		String[] selArgs = new String[] {id, ContactsContract.CommonDataKinds.Im.CONTENT_ITEM_TYPE};
-		Cursor c = this.getContentResolver().query(uri,	null, selection, selArgs, null);
+			.append(ContactsContract.Data.CONTACT_ID).append(" =  ? AND ")
+			.append(ContactsContract.Data.MIMETYPE).append(" = '")
+			.append(ContactsContract.CommonDataKinds.Im.CONTENT_ITEM_TYPE)
+			.append("' AND lower(")
+			.append(ContactsContract.CommonDataKinds.Im.CUSTOM_PROTOCOL)
+			.append(") = 'sip'")
+			.toString();
+		Cursor c = getContentResolver().query(uri, projection, selection, new String[]{id}, null);
 
 		int nbId = c.getColumnIndex(ContactsContract.CommonDataKinds.Im.DATA);
-
 		while (c.moveToNext()) {
 			list.add("sip:" + c.getString(nbId)); 
 		}
-
 		c.close();
 		
+
 		// Using the SIP contact field added in SDK 9
 		if (Version.sdkAboveOrEqual(Version.API09_GINGERBREAD_23)) {
-			selection = ContactsContract.Data.CONTACT_ID + " = ? AND " + ContactsContract.Data.MIMETYPE + " = ?";
-			String projection[] = new String[] {ContactsContract.CommonDataKinds.SipAddress.SIP_ADDRESS};
-			selArgs = new String[] {id, ContactsContract.CommonDataKinds.SipAddress.CONTENT_ITEM_TYPE};
-			c = this.getContentResolver().query(uri, projection, selection, selArgs, null);
+			selection = new StringBuilder()
+				.append(ContactsContract.Data.CONTACT_ID)
+				.append(" = ? AND ")
+				.append(ContactsContract.Data.MIMETYPE)
+				.append(" = '")
+				.append(ContactsContract.CommonDataKinds.SipAddress.CONTENT_ITEM_TYPE)
+				.append("'")
+				.toString();
+			projection = new String[] {ContactsContract.CommonDataKinds.SipAddress.SIP_ADDRESS};
+			c = this.getContentResolver().query(uri, projection, selection, new String[]{id}, null);
 
 			nbId = c.getColumnIndex(ContactsContract.CommonDataKinds.SipAddress.SIP_ADDRESS);
 			while (c.moveToNext()) {
 				list.add("sip:" + c.getString(nbId)); 
 			}
-
 			c.close();
 		}
 
@@ -162,13 +179,14 @@ public class ContactPickerActivityNew extends AbstractContactPickerActivity {
 	private String retrieveContactName(String id) {
 		//Uri uri = ContactsContract.CommonDataKinds.Phone.CONTENT_URI;
 		Uri uri = ContactsContract.Contacts.CONTENT_URI;
+		String[] projection = new String[] {ContactsContract.Contacts.DISPLAY_NAME};
 		String selection = ContactsContract.Contacts._ID + " = ?";
 		String[] selArgs = new String[] {id};
-		Cursor c = this.getContentResolver().query(uri,	null, selection, selArgs, null);
+		Cursor c = this.getContentResolver().query(uri,	projection, selection, selArgs, null);
 
 		String name = "";
 		if (c.moveToFirst()) {
-			name =  c.getString(c.getColumnIndex(ContactsContract.Contacts.DISPLAY_NAME)); 
+			name = c.getString(c.getColumnIndex(ContactsContract.Contacts.DISPLAY_NAME)); 
 		}
 		c.close();
 
@@ -199,4 +217,58 @@ public class ContactPickerActivityNew extends AbstractContactPickerActivity {
 	}
 
 
+	private static Uri retrievePhotoUri(ContentResolver resolver, Cursor c, String column) {
+		if (c == null) return null;
+		while (c.moveToNext()) {
+			long id = c.getLong(c.getColumnIndex(column));
+			Uri picture = retrievePhotoUri(resolver, id);
+			if (picture != null) {
+				c.close();
+				return picture;
+			}
+		}
+		c.close();
+		return null;
+	}
+	public static Uri findUriPictureOfContact(ContentResolver resolver, String username, String domain) {
+		Uri retrievedPictureUri = null;
+		String sipUri = username + "@" + domain;
+
+		// Try first using sip field
+		Uri uri = ContactsContract.Data.CONTENT_URI;
+		String[] projection = {ContactsContract.Data.CONTACT_ID};
+		String selection = new StringBuilder()
+			.append(ContactsContract.CommonDataKinds.Im.DATA).append(" =  ? AND ")
+			.append(ContactsContract.Data.MIMETYPE)
+			.append(" = '")
+			.append(ContactsContract.CommonDataKinds.Im.CONTENT_ITEM_TYPE)
+			.append("' AND lower(")
+			.append(ContactsContract.CommonDataKinds.Im.CUSTOM_PROTOCOL)
+			.append(") = 'sip'").toString();
+		Cursor c = resolver.query(uri, projection, selection, new String[] {sipUri}, null);
+		retrievedPictureUri = retrievePhotoUri(resolver, c, ContactsContract.Data.CONTACT_ID);
+		if (retrievedPictureUri != null) return retrievedPictureUri;
+
+
+		// Then using custom SIP field
+		if (Version.sdkAboveOrEqual(Version.API09_GINGERBREAD_23)) {
+			selection = new StringBuilder()
+				.append(ContactsContract.CommonDataKinds.SipAddress.SIP_ADDRESS)
+				.append(" = ? AND ")
+				.append(ContactsContract.Data.MIMETYPE)
+				.append(" = '")
+				.append(ContactsContract.CommonDataKinds.SipAddress.CONTENT_ITEM_TYPE)
+				.append("'")
+				.toString();
+			c = resolver.query(uri, projection, selection, new String[] {sipUri}, null);
+			retrievedPictureUri = retrievePhotoUri(resolver, c, ContactsContract.Data.CONTACT_ID);
+			if (retrievedPictureUri != null) return retrievedPictureUri;
+		}
+
+		// Finally using phone number
+		Uri lookupUri = Uri.withAppendedPath(PhoneLookup.CONTENT_FILTER_URI, Uri.encode(username));
+		projection = new String[]{PhoneLookup._ID};
+		c = resolver.query(lookupUri, projection, null, null, null);
+		return retrievePhotoUri(resolver, c, PhoneLookup._ID);
+	}
 }
diff --git a/src/org/linphone/ContactPickerActivityOld.java b/src/org/linphone/ContactPickerActivityOld.java
index cf7489816..38c939ce5 100644
--- a/src/org/linphone/ContactPickerActivityOld.java
+++ b/src/org/linphone/ContactPickerActivityOld.java
@@ -19,6 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 package org.linphone;
 
 import android.app.Activity;
+import android.content.ContentResolver;
 import android.content.ContentUris;
 import android.content.Intent;
 import android.database.Cursor;
@@ -91,4 +92,8 @@ public class ContactPickerActivityOld extends Activity {
             	LinphoneActivity.instance().getTabHost().setCurrentTabByTag(LinphoneActivity.DIALER_TAB);	
             }
         }
+
+	public static Uri findUriPictureOfContact(ContentResolver resolver, String username, String domain) {
+		throw new RuntimeException("not implemented");
+	}
 }
diff --git a/src/org/linphone/DialerActivity.java b/src/org/linphone/DialerActivity.java
index f81a701d8..fbc1183d4 100644
--- a/src/org/linphone/DialerActivity.java
+++ b/src/org/linphone/DialerActivity.java
@@ -137,8 +137,11 @@ public class DialerActivity extends Activity implements LinphoneGuiListener, Lin
 		mInCallAddressLayout = findViewById(R.id.IncallAddressLayout);
 		mInCallAddressLayout.setVisibility(View.GONE);
 
-		if (useIncallActivity) {
-			mHangup = findViewById(R.id.HangUp); 
+		if (useConferenceActivity) {
+			mHangup = findViewById(R.id.HangUp);
+			((HangCallButton)mHangup).setTerminateAllCalls(true);
+		} else if (useIncallActivity) {
+			mHangup = findViewById(R.id.HangUp);
 		} else {
 			mMute = (MuteMicButton) findViewById(R.id.mic_mute_button);
 			mSpeaker = (SpeakerButton) findViewById(R.id.speaker_button);
diff --git a/src/org/linphone/IncomingCallActivity.java b/src/org/linphone/IncomingCallActivity.java
index 5e3bccc3f..5beb9bfbb 100644
--- a/src/org/linphone/IncomingCallActivity.java
+++ b/src/org/linphone/IncomingCallActivity.java
@@ -18,17 +18,22 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 package org.linphone;
 
+import static android.view.View.VISIBLE;
+
 import org.linphone.core.LinphoneAddress;
 import org.linphone.core.LinphoneCall;
 import org.linphone.core.Log;
 
 import android.app.Activity;
 import android.content.Intent;
+import android.net.Uri;
 import android.os.Bundle;
+import android.text.Html.ImageGetter;
 import android.view.KeyEvent;
 import android.view.View;
 import android.view.WindowManager;
 import android.view.View.OnClickListener;
+import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -42,6 +47,7 @@ public class IncomingCallActivity extends Activity implements OnClickListener {
 
 	private TextView mNameView;
 	private TextView mNumberView;
+	private ImageView mPictureView;
 	private LinphoneCall mCall;
 
 	private void findIncomingCall(Intent intent) {
@@ -62,6 +68,7 @@ public class IncomingCallActivity extends Activity implements OnClickListener {
 
 		mNameView = (TextView) findViewById(R.id.incoming_caller_name);
 		mNumberView = (TextView) findViewById(R.id.incoming_caller_number);
+		mPictureView = (ImageView) findViewById(R.id.incoming_picture);
 
 		findViewById(R.id.Decline).setOnClickListener(this);
 		findViewById(R.id.Answer).setOnClickListener(this);
@@ -84,6 +91,11 @@ public class IncomingCallActivity extends Activity implements OnClickListener {
 		String from = LinphoneManager.extractADisplayName(getResources(), address);
 		mNameView.setText(from);
 		mNumberView.setText(address.asStringUriOnly());
+		String username = address.getUserName();
+		String domain = address.getDomain();
+		// May be greatly sped up using a drawable cache
+		Uri uri = LinphoneUtils.findPictureOfContact(getContentResolver(), username, domain);
+		LinphoneUtils.setImagePictureFromUri(mPictureView, uri, R.drawable.unknown_person);
 		super.onResume();
 	}
 
diff --git a/src/org/linphone/LinphoneUtils.java b/src/org/linphone/LinphoneUtils.java
index a9c884892..7234b0758 100644
--- a/src/org/linphone/LinphoneUtils.java
+++ b/src/org/linphone/LinphoneUtils.java
@@ -18,15 +18,26 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 package org.linphone;
 
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URL;
+
 import org.linphone.core.Log;
+import org.linphone.mediastream.Version;
 import org.linphone.mediastream.video.capture.hwconf.Hacks;
 
 import android.app.Activity;
+import android.content.ContentResolver;
 import android.content.Intent;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.net.Uri;
 import android.view.KeyEvent;
+import android.widget.ImageView;
 
 /**
- * Helper to handle softvolume.
+ * Helpers.
  * @author Guillaume Beraudo
  *
  */
@@ -63,5 +74,50 @@ public final class LinphoneUtils {
 		}
 		return !preventVolumeBarToDisplay;
 	}
+
+
+	/**
+	 * @param contact sip uri
+	 * @return url/uri of the resource
+	 */
+	public static Uri findPictureOfContact(ContentResolver resolver, String username, String domain) {
+		if (Version.sdkAboveOrEqual(Version.API06_ECLAIR_20)) {
+			return ContactPickerActivityNew.findUriPictureOfContact(resolver, username, domain);
+		} else {
+			return ContactPickerActivityOld.findUriPictureOfContact(resolver, username, domain);
+		}
+	}
+	
+	public static Bitmap downloadBitmap(Uri uri) {
+		URL url;
+		InputStream is = null;
+		try {
+			url = new URL(uri.toString());
+			is = url.openStream();
+			return BitmapFactory.decodeStream(is);
+		} catch (MalformedURLException e) {
+			Log.e(e, e.getMessage());
+		} catch (IOException e) {
+			Log.e(e, e.getMessage());
+		} finally {
+			try {is.close();} catch (IOException x) {}
+		}
+		return null;
+	}
+
+	public static void setImagePictureFromUri(ImageView view, Uri uri, int notFoundResource) {
+		if (uri == null) {
+			view.setImageResource(notFoundResource);
+			return;
+		}
+		if (uri.getScheme().startsWith("http")) {
+			Bitmap bm = downloadBitmap(uri);
+			if (bm == null) view.setImageResource(notFoundResource);
+			view.setImageBitmap(bm);
+		} else {
+			view.setImageURI(uri);
+		}
+	}
+
 }
 
diff --git a/src/org/linphone/ui/HangCallButton.java b/src/org/linphone/ui/HangCallButton.java
index 706df35ec..9194c844d 100644
--- a/src/org/linphone/ui/HangCallButton.java
+++ b/src/org/linphone/ui/HangCallButton.java
@@ -29,6 +29,9 @@ import android.widget.ImageButton;
 
 public class HangCallButton extends ImageButton implements OnClickListener {
 
+	private boolean terminateAllCalls;
+	public void setTerminateAllCalls(boolean all) {terminateAllCalls = all;}
+
 	private OnClickListener externalClickListener;
 	public void setExternalClickListener(OnClickListener e) {externalClickListener = e;}
 
@@ -39,7 +42,11 @@ public class HangCallButton extends ImageButton implements OnClickListener {
 
 	public void onClick(View v) {
 		LinphoneCore lc =  LinphoneManager.getLc();
-		lc.terminateCall(lc.getCurrentCall());
+		if (terminateAllCalls) {
+			lc.terminateAllCalls();
+		} else {
+			lc.terminateCall(lc.getCurrentCall());
+		}
 
 		if (externalClickListener != null) externalClickListener.onClick(v);
 	}

From 53b2381ad86aaaab7d93147759f7e900df33c658 Mon Sep 17 00:00:00 2001
From: Guillaume Beraudo <guillaume.beraudo@belledonne-communications.com>
Date: Tue, 4 Oct 2011 10:10:42 +0200
Subject: [PATCH 18/62] Fix bug report generation temp file

Use application space to store the temporary file if it cannot be stored in
the default place.
---
 src/org/linphone/AboutActivity.java | 35 +++++++++++++++++------------
 1 file changed, 21 insertions(+), 14 deletions(-)

diff --git a/src/org/linphone/AboutActivity.java b/src/org/linphone/AboutActivity.java
index 8fd0c7474..3f0397805 100644
--- a/src/org/linphone/AboutActivity.java
+++ b/src/org/linphone/AboutActivity.java
@@ -73,26 +73,32 @@ public class AboutActivity extends Activity implements OnClickListener {
 		thread.start();
 	}
 
+	private File writeLogs(String logs, File directory) {
+		File tempFile = null;
+		try {
+			tempFile = File.createTempFile("bugreport", ".txt", directory);
+			tempFile.deleteOnExit();
+			FileWriter writer = new FileWriter(tempFile);
+			writer.append(logs);
+			return tempFile;
+		} catch (IOException e) {
+			Toast.makeText(this, getString(R.string.about_error_generating_bugreport_attachement), Toast.LENGTH_LONG).show();
+			Log.e(e, "couldn't write to temporary file");
+			return null;
+		}
+	}
+
 	private void onLogsRead(String logs) {
-		File tempFile;
 		if (logs == null) {
 			Toast.makeText(this, getString(R.string.about_logs_not_found), Toast.LENGTH_SHORT).show();
 		} else {
-
-			try {
-				tempFile = File.createTempFile("bugreport", ".txt");
-				tempFile.deleteOnExit();
-				FileWriter writer = new FileWriter(tempFile);
-				writer.append(logs);
-			} catch (IOException e) {
-				Toast.makeText(this, getString(R.string.about_error_generating_bugreport_attachement), Toast.LENGTH_LONG).show();
-				Log.e(e, "couldn't write to temporary file");
-				return;
-			} finally {
-				thread = null;
+			File tempFile = writeLogs(logs, null);
+			if (tempFile == null) {
+				// If writing to temporary file to default location failed
+				// Write one to our storage place
+				tempFile = writeLogs(logs, getFilesDir());
 			}
 
-
 			Intent intent = new Intent(Intent.ACTION_SEND);
 			intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
 			intent.setType("plain/text");
@@ -114,6 +120,7 @@ public class AboutActivity extends Activity implements OnClickListener {
 				@Override
 				public void run() {
 					onLogsRead(logs);
+					thread=null;
 				}
 			});
 			super.run();

From ca128f033c261a2981fd5abda0ab0f2037a5557f Mon Sep 17 00:00:00 2001
From: Guillaume Beraudo <guillaume.beraudo@belledonne-communications.com>
Date: Tue, 4 Oct 2011 12:32:30 +0200
Subject: [PATCH 19/62] Old API contact picture from number (a bit hackish)

To workaround exception on setting view backgroung from uri,
the people uri is returned and the bitmap is extracted directly
in the LinphoneUtils helper class.
---
 src/org/linphone/ConferenceActivity.java      |  4 +-
 .../linphone/ContactPickerActivityOld.java    | 38 +++++++++++++++++--
 src/org/linphone/IncomingCallActivity.java    |  2 +-
 src/org/linphone/LinphoneUtils.java           | 10 ++++-
 4 files changed, 45 insertions(+), 9 deletions(-)

diff --git a/src/org/linphone/ConferenceActivity.java b/src/org/linphone/ConferenceActivity.java
index 8d815a4c4..0620c7968 100644
--- a/src/org/linphone/ConferenceActivity.java
+++ b/src/org/linphone/ConferenceActivity.java
@@ -180,7 +180,7 @@ public class ConferenceActivity extends ListActivity implements
 				getContentResolver(),
 				currentCall.getRemoteAddress().getUserName(),
 				currentCall.getRemoteAddress().getDomain());
-		LinphoneUtils.setImagePictureFromUri(view, picture, R.drawable.unknown_person);
+		LinphoneUtils.setImagePictureFromUri(this, view, picture, R.drawable.unknown_person);
 		view.setVisibility(VISIBLE);
 	}
 
@@ -535,7 +535,7 @@ public class ConferenceActivity extends ListActivity implements
 				String domain = call.getRemoteAddress().getDomain();
 				// May be greatly sped up using a drawable cache
 				Uri uri = LinphoneUtils.findPictureOfContact(getContentResolver(), username, domain);
-				LinphoneUtils.setImagePictureFromUri(pictureView, uri, R.drawable.unknown_person);
+				LinphoneUtils.setImagePictureFromUri(ConferenceActivity.this, pictureView, uri, R.drawable.unknown_person);
 				pictureView.setVisibility(VISIBLE);
 			} else {
 				pictureView.setVisibility(GONE);
diff --git a/src/org/linphone/ContactPickerActivityOld.java b/src/org/linphone/ContactPickerActivityOld.java
index 38c939ce5..1d8eeae46 100644
--- a/src/org/linphone/ContactPickerActivityOld.java
+++ b/src/org/linphone/ContactPickerActivityOld.java
@@ -49,17 +49,25 @@ public class ContactPickerActivityOld extends Activity {
 
 	}
 
-    private Uri getPhotoUri(Uri photoUri) {
-    	Cursor cursor = getContentResolver().query(photoUri, new String[]{Photos.DATA}, null, null, null);
+    private Uri getPhotoUri(Uri photoUriToTest) {
+		return retrievePhotoUri(getContentResolver(), photoUriToTest);
+	}
+
+	private static Uri retrievePhotoUri(ContentResolver resolver, Uri photoUriToTest) {
+    	Cursor cursor = resolver.query(photoUriToTest, new String[]{Photos.DATA}, null, null, null);
     	try {
     		if (cursor == null || !cursor.moveToNext()) {
     			return null;
     		}   
     		byte[] data = cursor.getBlob(0);
     		if (data == null) {
+    			// TODO: simplify all this stuff
+				// which is here only to check that the
+				// photoUri really points to some data.
+				// Not retrieving the data now would be better.
     			return null;
     		}   
-    		return photoUri;
+    		return photoUriToTest;
     	} finally {
     		if (cursor != null) cursor.close();
     	}   
@@ -93,7 +101,29 @@ public class ContactPickerActivityOld extends Activity {
             }
         }
 
+	private static Uri retrievePhotoUriAndCloseC(ContentResolver resolver, Cursor c, String column) {
+		if (c == null) return null;
+		while (c.moveToNext()) {
+			long id = c.getLong(c.getColumnIndex(column));
+            Uri personUri = ContentUris.withAppendedId(People.CONTENT_URI, id);
+			Uri potentialPictureUri = Uri.withAppendedPath(personUri, Contacts.Photos.CONTENT_DIRECTORY);
+			Uri pictureUri = retrievePhotoUri(resolver, potentialPictureUri);
+			if (pictureUri != null) {
+				c.close();
+				return personUri; // FIXME, see LinphoneUtils
+			}
+		}
+		c.close();
+		return null;
+	}
+
 	public static Uri findUriPictureOfContact(ContentResolver resolver, String username, String domain) {
-		throw new RuntimeException("not implemented");
+		// A direct qery on the number column doesn't work as the number is stored
+		// with hyphens inside it.
+		Uri contactUri = Uri.withAppendedPath(Contacts.Phones.CONTENT_FILTER_URL, Uri.encode("0952636505"));
+		String[] projection = {Contacts.Phones.PERSON_ID};
+		Cursor c = resolver.query(contactUri, projection, null, null, null);
+		
+		return retrievePhotoUriAndCloseC(resolver, c, Contacts.Phones.PERSON_ID);
 	}
 }
diff --git a/src/org/linphone/IncomingCallActivity.java b/src/org/linphone/IncomingCallActivity.java
index 5beb9bfbb..a43c3d02b 100644
--- a/src/org/linphone/IncomingCallActivity.java
+++ b/src/org/linphone/IncomingCallActivity.java
@@ -95,7 +95,7 @@ public class IncomingCallActivity extends Activity implements OnClickListener {
 		String domain = address.getDomain();
 		// May be greatly sped up using a drawable cache
 		Uri uri = LinphoneUtils.findPictureOfContact(getContentResolver(), username, domain);
-		LinphoneUtils.setImagePictureFromUri(mPictureView, uri, R.drawable.unknown_person);
+		LinphoneUtils.setImagePictureFromUri(this, mPictureView, uri, R.drawable.unknown_person);
 		super.onResume();
 	}
 
diff --git a/src/org/linphone/LinphoneUtils.java b/src/org/linphone/LinphoneUtils.java
index 7234b0758..1a3022927 100644
--- a/src/org/linphone/LinphoneUtils.java
+++ b/src/org/linphone/LinphoneUtils.java
@@ -29,6 +29,7 @@ import org.linphone.mediastream.video.capture.hwconf.Hacks;
 
 import android.app.Activity;
 import android.content.ContentResolver;
+import android.content.Context;
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
@@ -105,7 +106,7 @@ public final class LinphoneUtils {
 		return null;
 	}
 
-	public static void setImagePictureFromUri(ImageView view, Uri uri, int notFoundResource) {
+	public static void setImagePictureFromUri(Context c, ImageView view, Uri uri, int notFoundResource) {
 		if (uri == null) {
 			view.setImageResource(notFoundResource);
 			return;
@@ -115,7 +116,12 @@ public final class LinphoneUtils {
 			if (bm == null) view.setImageResource(notFoundResource);
 			view.setImageBitmap(bm);
 		} else {
-			view.setImageURI(uri);
+			if (Version.sdkAboveOrEqual(Version.API06_ECLAIR_20)) {
+				view.setImageURI(uri);
+			} else {
+				Bitmap bitmap = android.provider.Contacts.People.loadContactPhoto(c, uri, notFoundResource, null);
+				view.setImageBitmap(bitmap);
+			}
 		}
 	}
 

From 3eeaf74d5a5fb0a6024d55d6aaa848b98d7473b8 Mon Sep 17 00:00:00 2001
From: Guillaume Beraudo <guillaume.beraudo@belledonne-communications.com>
Date: Tue, 4 Oct 2011 12:36:11 +0200
Subject: [PATCH 20/62] Fix callee box text alignment and reduce contact's
 picture size

---
 res/layout/conf_callee.xml  | 9 ++++-----
 res/layout/conferencing.xml | 2 +-
 res/layout/incoming.xml     | 2 +-
 res/values/callee_style.xml | 2 ++
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/res/layout/conf_callee.xml b/res/layout/conf_callee.xml
index 74d923c93..7d3995cc5 100644
--- a/res/layout/conf_callee.xml
+++ b/res/layout/conf_callee.xml
@@ -36,13 +36,12 @@
 	</LinearLayout>
 
 
-    <LinearLayout android:id="@+id/callee_block" 
+    <LinearLayout android:id="@+id/callee_block" android:orientation="vertical"
     	android:layout_toRightOf="@id/picture" android:layout_toLeftOf="@id/callee_statuses"
-    	android:layout_width="fill_parent" android:layout_height="fill_parent"
-    	android:layout_centerVertical="true" android:orientation="vertical">
+    	android:layout_width="fill_parent" android:layout_height="fill_parent" 
+    	android:layout_alignParentTop="true" android:layout_alignParentBottom="true">
       <TextView android:id="@+id/name" style="@style/callee_name" />
-      <TextView android:id="@+id/address" style="@style/callee_address" android:singleLine="true"
-		android:ellipsize="marquee"/>
+      <TextView android:id="@+id/address" style="@style/callee_address" />
     </LinearLayout>
 
 
diff --git a/res/layout/conferencing.xml b/res/layout/conferencing.xml
index 42781aeb8..13f9c62ab 100644
--- a/res/layout/conferencing.xml
+++ b/res/layout/conferencing.xml
@@ -60,7 +60,7 @@
 		<ImageView android:id="@+id/incall_picture" android:visibility="gone"
 			android:layout_height="wrap_content" android:layout_width="wrap_content" 
 			android:layout_gravity="center" android:scaleType="fitCenter"
-			android:padding="10sp" android:minWidth="288px" android:minHeight="288px"
+			android:padding="10sp" android:minWidth="192px" android:minHeight="192px"
 			android:paddingBottom="50sp" />
 	</FrameLayout>
 
diff --git a/res/layout/incoming.xml b/res/layout/incoming.xml
index aab32ea21..1f3d8277f 100644
--- a/res/layout/incoming.xml
+++ b/res/layout/incoming.xml
@@ -16,7 +16,7 @@
 		<ImageView android:id="@+id/incoming_picture"
 			android:layout_height="wrap_content" android:layout_width="wrap_content" 
 			android:layout_gravity="center" android:scaleType="fitCenter"
-			android:minWidth="288px" android:minHeight="288px"
+			android:minWidth="192px" android:minHeight="192px"
 			android:paddingBottom="10sp"/>
 		<TextView android:id="@+id/incoming_caller_name"
 			android:layout_width="wrap_content" android:layout_height="wrap_content"
diff --git a/res/values/callee_style.xml b/res/values/callee_style.xml
index 5a82de385..5d659aea5 100644
--- a/res/values/callee_style.xml
+++ b/res/values/callee_style.xml
@@ -12,6 +12,8 @@
         <item name="android:layout_height">fill_parent</item>
         <item name="android:layout_weight">1</item>
         <item name="android:gravity">fill_vertical</item>
+        <item name="android:singleLine">true</item>
+        <item name="android:ellipsize">marquee</item>
     </style>
 
 	<style name="callee_status">

From 99807340f50793993252ecedcbc62ba39c963fb3 Mon Sep 17 00:00:00 2001
From: Guillaume Beraudo <guillaume.beraudo@belledonne-communications.com>
Date: Tue, 4 Oct 2011 12:37:24 +0200
Subject: [PATCH 21/62] Calls in conference are never the current one.

---
 submodules/linphone | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/submodules/linphone b/submodules/linphone
index df65d1137..b7dacbd01 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit df65d113730693274f1b35a516b0a065aa7c755c
+Subproject commit b7dacbd01a6a9f84560033413f000597f469a718

From 534af8c62c567d7f4c3a6e44e0f8e9462df15935 Mon Sep 17 00:00:00 2001
From: Guillaume Beraudo <guillaume.beraudo@belledonne-communications.com>
Date: Wed, 5 Oct 2011 10:22:23 +0200
Subject: [PATCH 22/62] Fix contact lookup from number (old + new).

---
 .../linphone/ContactPickerActivityNew.java    | 19 +++++++++++++++++--
 .../linphone/ContactPickerActivityOld.java    |  8 ++++----
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/src/org/linphone/ContactPickerActivityNew.java b/src/org/linphone/ContactPickerActivityNew.java
index 8aff6361b..3154e7345 100644
--- a/src/org/linphone/ContactPickerActivityNew.java
+++ b/src/org/linphone/ContactPickerActivityNew.java
@@ -31,6 +31,7 @@ import android.net.Uri;
 import android.provider.ContactsContract;
 import android.provider.ContactsContract.Contacts;
 import android.provider.ContactsContract.PhoneLookup;
+import android.telephony.PhoneNumberUtils;
 import android.text.TextUtils;
 
 
@@ -266,9 +267,23 @@ public class ContactPickerActivityNew extends AbstractContactPickerActivity {
 		}
 
 		// Finally using phone number
+		String normalizedNumber = PhoneNumberUtils.getStrippedReversed(username);
 		Uri lookupUri = Uri.withAppendedPath(PhoneLookup.CONTENT_FILTER_URI, Uri.encode(username));
-		projection = new String[]{PhoneLookup._ID};
+		projection = new String[]{PhoneLookup._ID, PhoneLookup.NUMBER};
 		c = resolver.query(lookupUri, projection, null, null, null);
-		return retrievePhotoUri(resolver, c, PhoneLookup._ID);
+		while (c.moveToNext()) {
+			long id = c.getLong(c.getColumnIndex(PhoneLookup._ID));
+			String enteredNumber = c.getString(c.getColumnIndex(PhoneLookup.NUMBER));
+			if (!normalizedNumber.equals(PhoneNumberUtils.getStrippedReversed(enteredNumber))) {
+				continue;
+			}
+			Uri picture = retrievePhotoUri(resolver, id);
+			if (picture != null) {
+				c.close();
+				return picture;
+			}
+		}
+		c.close();
+		return null;
 	}
 }
diff --git a/src/org/linphone/ContactPickerActivityOld.java b/src/org/linphone/ContactPickerActivityOld.java
index 1d8eeae46..8581c20d6 100644
--- a/src/org/linphone/ContactPickerActivityOld.java
+++ b/src/org/linphone/ContactPickerActivityOld.java
@@ -28,6 +28,7 @@ import android.os.Bundle;
 import android.provider.Contacts;
 import android.provider.Contacts.People;
 import android.provider.Contacts.Photos;
+import android.telephony.PhoneNumberUtils;
 
 @SuppressWarnings("deprecation")
 public class ContactPickerActivityOld extends Activity {
@@ -118,11 +119,10 @@ public class ContactPickerActivityOld extends Activity {
 	}
 
 	public static Uri findUriPictureOfContact(ContentResolver resolver, String username, String domain) {
-		// A direct qery on the number column doesn't work as the number is stored
-		// with hyphens inside it.
-		Uri contactUri = Uri.withAppendedPath(Contacts.Phones.CONTENT_FILTER_URL, Uri.encode("0952636505"));
+		String normalizedNumber = PhoneNumberUtils.getStrippedReversed(username);
 		String[] projection = {Contacts.Phones.PERSON_ID};
-		Cursor c = resolver.query(contactUri, projection, null, null, null);
+		String selection = Contacts.Phones.NUMBER_KEY + "=" + normalizedNumber;
+		Cursor c = resolver.query(Contacts.Phones.CONTENT_URI, projection, selection, null, null);
 		
 		return retrievePhotoUriAndCloseC(resolver, c, Contacts.Phones.PERSON_ID);
 	}

From 491a71e0177798fa87022ada6ea3f748757be677 Mon Sep 17 00:00:00 2001
From: Guillaume Beraudo <guillaume.beraudo@belledonne-communications.com>
Date: Wed, 5 Oct 2011 10:34:20 +0200
Subject: [PATCH 23/62] Fix crash in incoming call on resume.

---
 src/org/linphone/IncomingCallActivity.java | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/org/linphone/IncomingCallActivity.java b/src/org/linphone/IncomingCallActivity.java
index a43c3d02b..2ce2e12bf 100644
--- a/src/org/linphone/IncomingCallActivity.java
+++ b/src/org/linphone/IncomingCallActivity.java
@@ -18,8 +18,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 package org.linphone;
 
-import static android.view.View.VISIBLE;
-
 import org.linphone.core.LinphoneAddress;
 import org.linphone.core.LinphoneCall;
 import org.linphone.core.Log;
@@ -28,7 +26,6 @@ import android.app.Activity;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.text.Html.ImageGetter;
 import android.view.KeyEvent;
 import android.view.View;
 import android.view.WindowManager;
@@ -61,8 +58,6 @@ public class IncomingCallActivity extends Activity implements OnClickListener {
 
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
-		findIncomingCall(getIntent());
-
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.incoming);
 
@@ -79,14 +74,15 @@ public class IncomingCallActivity extends Activity implements OnClickListener {
         getWindow().addFlags(flags);
 	}
 
-	@Override
-	protected void onNewIntent(Intent intent) {
-		findIncomingCall(intent);
-		super.onNewIntent(intent);
-	}
 	
 	@Override
 	protected void onResume() {
+		super.onResume();
+		findIncomingCall(getIntent());
+		if (mCall == null) {
+			finish();
+			return;
+		}
 		LinphoneAddress address = mCall.getRemoteAddress();
 		String from = LinphoneManager.extractADisplayName(getResources(), address);
 		mNameView.setText(from);
@@ -96,7 +92,6 @@ public class IncomingCallActivity extends Activity implements OnClickListener {
 		// May be greatly sped up using a drawable cache
 		Uri uri = LinphoneUtils.findPictureOfContact(getContentResolver(), username, domain);
 		LinphoneUtils.setImagePictureFromUri(this, mPictureView, uri, R.drawable.unknown_person);
-		super.onResume();
 	}
 
 	@Override

From f4466f78fc423b27cac0dfae21076b3d66a634ab Mon Sep 17 00:00:00 2001
From: Guillaume Beraudo <guillaume.beraudo@belledonne-communications.com>
Date: Wed, 5 Oct 2011 15:13:15 +0200
Subject: [PATCH 24/62] Fix contact lookup from number (old + new)

---
 src/org/linphone/ContactPickerActivityNew.java | 4 ++++
 src/org/linphone/ContactPickerActivityOld.java | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/src/org/linphone/ContactPickerActivityNew.java b/src/org/linphone/ContactPickerActivityNew.java
index 3154e7345..d85a2c5aa 100644
--- a/src/org/linphone/ContactPickerActivityNew.java
+++ b/src/org/linphone/ContactPickerActivityNew.java
@@ -268,6 +268,10 @@ public class ContactPickerActivityNew extends AbstractContactPickerActivity {
 
 		// Finally using phone number
 		String normalizedNumber = PhoneNumberUtils.getStrippedReversed(username);
+		if (TextUtils.isEmpty(normalizedNumber)) {
+			// non phone username
+			return null;
+		}
 		Uri lookupUri = Uri.withAppendedPath(PhoneLookup.CONTENT_FILTER_URI, Uri.encode(username));
 		projection = new String[]{PhoneLookup._ID, PhoneLookup.NUMBER};
 		c = resolver.query(lookupUri, projection, null, null, null);
diff --git a/src/org/linphone/ContactPickerActivityOld.java b/src/org/linphone/ContactPickerActivityOld.java
index 8581c20d6..e4be622cf 100644
--- a/src/org/linphone/ContactPickerActivityOld.java
+++ b/src/org/linphone/ContactPickerActivityOld.java
@@ -29,6 +29,7 @@ import android.provider.Contacts;
 import android.provider.Contacts.People;
 import android.provider.Contacts.Photos;
 import android.telephony.PhoneNumberUtils;
+import android.text.TextUtils;
 
 @SuppressWarnings("deprecation")
 public class ContactPickerActivityOld extends Activity {
@@ -120,6 +121,10 @@ public class ContactPickerActivityOld extends Activity {
 
 	public static Uri findUriPictureOfContact(ContentResolver resolver, String username, String domain) {
 		String normalizedNumber = PhoneNumberUtils.getStrippedReversed(username);
+		if (TextUtils.isEmpty(normalizedNumber)) {
+			// non phone username
+			return null;
+		}
 		String[] projection = {Contacts.Phones.PERSON_ID};
 		String selection = Contacts.Phones.NUMBER_KEY + "=" + normalizedNumber;
 		Cursor c = resolver.query(Contacts.Phones.CONTENT_URI, projection, selection, null, null);

From 15e005bc2716e988c9698f53255b3aeb449992b0 Mon Sep 17 00:00:00 2001
From: Guillaume Beraudo <guillaume.beraudo@belledonne-communications.com>
Date: Wed, 5 Oct 2011 15:13:48 +0200
Subject: [PATCH 25/62] Custom conference UI for older sdk

Simplify to workaround display bugs on 1.5 and 1.6 versions.
---
 res/layout/conf_callee.xml               |  2 +-
 res/layout/conf_callee_older_devices.xml | 42 ++++++++++++++++++++++++
 res/layout/conferencing.xml              |  2 +-
 src/org/linphone/ConferenceActivity.java |  6 +++-
 4 files changed, 49 insertions(+), 3 deletions(-)
 create mode 100644 res/layout/conf_callee_older_devices.xml

diff --git a/res/layout/conf_callee.xml b/res/layout/conf_callee.xml
index 7d3995cc5..aaa3e1285 100644
--- a/res/layout/conf_callee.xml
+++ b/res/layout/conf_callee.xml
@@ -39,7 +39,7 @@
     <LinearLayout android:id="@+id/callee_block" android:orientation="vertical"
     	android:layout_toRightOf="@id/picture" android:layout_toLeftOf="@id/callee_statuses"
     	android:layout_width="fill_parent" android:layout_height="fill_parent" 
-    	android:layout_alignParentTop="true" android:layout_alignParentBottom="true">
+    	android:layout_centerVertical="true">
       <TextView android:id="@+id/name" style="@style/callee_name" />
       <TextView android:id="@+id/address" style="@style/callee_address" />
     </LinearLayout>
diff --git a/res/layout/conf_callee_older_devices.xml b/res/layout/conf_callee_older_devices.xml
new file mode 100644
index 000000000..ce1532836
--- /dev/null
+++ b/res/layout/conf_callee_older_devices.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+  android:layout_width="fill_parent" android:layout_height="48px" >
+  
+    <ImageView android:id="@+id/picture" android:layout_width="48px"
+     android:src="@drawable/unknown_person" android:layout_height="48px"
+     android:paddingLeft="5px" android:scaleType="centerInside"/>
+
+
+    <LinearLayout android:id="@+id/callee_block" android:orientation="vertical"
+       	android:layout_width="wrap_content" android:layout_height="fill_parent">
+      <TextView android:id="@+id/name" style="@style/callee_name" />
+      <TextView android:id="@+id/address" style="@style/callee_address" />
+    </LinearLayout>
+
+	<View android:layout_height="fill_parent" android:layout_width="wrap_content" android:layout_weight="1"/>
+
+
+	<ImageButton android:id="@+id/addVideo" android:src="@drawable/conf_video"
+		android:layout_width="wrap_content" android:layout_height="wrap_content" />
+	<ImageButton android:id="@+id/merge_to_conference"
+		android:src="@drawable/conf_merge" android:layout_width="wrap_content"
+		android:layout_height="wrap_content" />
+	<ImageButton android:id="@+id/remove_from_conference"
+		android:src="@drawable/conf_remove" android:layout_width="wrap_content"
+		android:layout_height="wrap_content" />
+	<ImageButton android:id="@+id/unhook_call" android:src="@drawable/conf_unhook"
+		android:layout_width="wrap_content" android:layout_height="wrap_content" />
+	<ImageButton android:id="@+id/terminate_call" android:src="@drawable/conf_terminate"
+		android:layout_width="wrap_content" android:layout_height="wrap_content" />
+	<ImageButton android:id="@+id/pause" android:src="@drawable/conf_pause"
+		android:layout_width="wrap_content" android:layout_height="wrap_content" />
+	<ImageButton android:id="@+id/resume" android:src="@drawable/conf_resume"
+		android:layout_width="wrap_content" android:layout_height="wrap_content" />
+
+	<TextView android:id="@+id/status_label" style="@style/callee_status"
+		android:layout_height="fill_parent" />
+	<ImageView android:id="@+id/callee_status_paused" style="@style/callee_status"
+		android:src="@drawable/conf_status_paused" />
+	<ImageView android:id="@+id/callee_status_inconf" style="@style/callee_status"
+		android:src="@drawable/conf_status_inconf" />
+</LinearLayout>
diff --git a/res/layout/conferencing.xml b/res/layout/conferencing.xml
index 13f9c62ab..a0d20e514 100644
--- a/res/layout/conferencing.xml
+++ b/res/layout/conferencing.xml
@@ -26,7 +26,7 @@
 		<Button android:text="@string/AddCallButtonText" android:id="@+id/addCall"
 	     android:layout_width="wrap_content" android:layout_height="wrap_content" />
 
-		<org.linphone.ui.HangCallButton android:id="@+id/incallHang" android:layout_width="wrap_content" android:layout_height="wrap_content"
+		<org.linphone.ui.HangCallButton android:id="@+id/incallHang" android:layout_width="0dip" android:layout_height="wrap_content"
 		 android:src="@drawable/mini_stopcall_red"  android:layout_weight="1" />
 		 
 		<Button android:id="@+id/incallNumpadShow" android:text="@string/show_send_dtmfs_button"  
diff --git a/src/org/linphone/ConferenceActivity.java b/src/org/linphone/ConferenceActivity.java
index 0620c7968..e1061359d 100644
--- a/src/org/linphone/ConferenceActivity.java
+++ b/src/org/linphone/ConferenceActivity.java
@@ -431,7 +431,11 @@ public class ConferenceActivity extends ListActivity implements
 
 		public View getView(int position, View v, ViewGroup parent) {
 			if (v == null) {
-				v = getLayoutInflater().inflate(R.layout.conf_callee, null);
+				if (Version.sdkAboveOrEqual(Version.API06_ECLAIR_20)) {
+					v = getLayoutInflater().inflate(R.layout.conf_callee, null);
+				} else {
+					v = getLayoutInflater().inflate(R.layout.conf_callee_older_devices, null);
+				}
 			}
 
 			final LinphoneCall call = linphoneCalls.get(position);

From 5800f796b44bb58add8f2433b40bed5c2cebd38c Mon Sep 17 00:00:00 2001
From: Guillaume Beraudo <guillaume.beraudo@belledonne-communications.com>
Date: Thu, 6 Oct 2011 12:01:54 +0200
Subject: [PATCH 26/62] Conferencing style improvements on old sdk

---
 res/layout/conf_callee_older_devices.xml | 2 +-
 res/values/callee_style.xml              | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/res/layout/conf_callee_older_devices.xml b/res/layout/conf_callee_older_devices.xml
index ce1532836..5e2493081 100644
--- a/res/layout/conf_callee_older_devices.xml
+++ b/res/layout/conf_callee_older_devices.xml
@@ -8,7 +8,7 @@
 
 
     <LinearLayout android:id="@+id/callee_block" android:orientation="vertical"
-       	android:layout_width="wrap_content" android:layout_height="fill_parent">
+       	android:layout_width="wrap_content" android:layout_height="48px">
       <TextView android:id="@+id/name" style="@style/callee_name" />
       <TextView android:id="@+id/address" style="@style/callee_address" />
     </LinearLayout>
diff --git a/res/values/callee_style.xml b/res/values/callee_style.xml
index 5d659aea5..37a3edcc6 100644
--- a/res/values/callee_style.xml
+++ b/res/values/callee_style.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <style name="callee_name" parent="@android:style/TextAppearance.Large">
-        <item name="android:layout_width">fill_parent</item>
+        <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">fill_parent</item>
         <item name="android:layout_weight">1</item>
         <item name="android:gravity">fill_vertical</item>
     </style>
 
     <style name="callee_address" parent="@android:style/TextAppearance.Medium">
-        <item name="android:layout_width">fill_parent</item>
+        <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">fill_parent</item>
         <item name="android:layout_weight">1</item>
         <item name="android:gravity">fill_vertical</item>

From 5965b1b33c7ac2ba9ec2abba26bfc953e3c5bd9a Mon Sep 17 00:00:00 2001
From: Guillaume Beraudo <guillaume.beraudo@belledonne-communications.com>
Date: Thu, 6 Oct 2011 12:05:05 +0200
Subject: [PATCH 27/62] ContactHelper class getting photo and display name from
 (phone/sip) number

---
 src/org/linphone/ConferenceActivity.java      |  24 +-
 src/org/linphone/ContactHelper.java           | 258 ++++++++++++++++++
 .../linphone/ContactPickerActivityNew.java    |  98 +------
 .../linphone/ContactPickerActivityOld.java    |  61 +----
 src/org/linphone/IncomingCallActivity.java    |  16 +-
 src/org/linphone/LinphoneManager.java         |   2 +-
 src/org/linphone/LinphoneUtils.java           |  11 +-
 7 files changed, 296 insertions(+), 174 deletions(-)
 create mode 100644 src/org/linphone/ContactHelper.java

diff --git a/src/org/linphone/ConferenceActivity.java b/src/org/linphone/ConferenceActivity.java
index e1061359d..146d4a789 100644
--- a/src/org/linphone/ConferenceActivity.java
+++ b/src/org/linphone/ConferenceActivity.java
@@ -28,6 +28,7 @@ import java.util.List;
 
 import org.linphone.LinphoneManagerWaitHelper.LinphoneManagerReadyListener;
 import org.linphone.LinphoneSimpleListener.LinphoneOnCallStateChangedListener;
+import org.linphone.core.LinphoneAddress;
 import org.linphone.core.LinphoneCall;
 import org.linphone.core.LinphoneCore;
 import org.linphone.core.LinphoneCoreException;
@@ -176,10 +177,8 @@ public class ConferenceActivity extends ListActivity implements
 			return;
 		}
 
-		Uri picture = LinphoneUtils.findPictureOfContact(
-				getContentResolver(),
-				currentCall.getRemoteAddress().getUserName(),
-				currentCall.getRemoteAddress().getDomain());
+		Uri picture = LinphoneUtils.findUriPictureOfContactAndSetDisplayName(
+				currentCall.getRemoteAddress(),	getContentResolver());
 		LinphoneUtils.setImagePictureFromUri(this, view, picture, R.drawable.unknown_person);
 		view.setVisibility(VISIBLE);
 	}
@@ -441,16 +440,22 @@ public class ConferenceActivity extends ListActivity implements
 			final LinphoneCall call = linphoneCalls.get(position);
 			final LinphoneCall.State state = call.getState();
 
-			String mainText = call.getRemoteAddress().getDisplayName();
-			String username = call.getRemoteAddress().getUserName();
+			LinphoneAddress address = call.getRemoteAddress();
+			String mainText = address.getDisplayName();
+			String complText;
+			if ((getResources().getBoolean(R.bool.show_full_remote_address_on_incoming_call))) {
+				complText = address.getUserName() + "@" + address.getDomain();
+			} else {
+				complText = address.getUserName();
+			}
 			TextView mainTextView = (TextView) v.findViewById(R.id.name);
 			TextView complTextView = (TextView) v.findViewById(R.id.address);
 			if (TextUtils.isEmpty(mainText)) {
-				mainTextView.setText(username);
+				mainTextView.setText(complText);
 				complTextView.setVisibility(View.GONE);
 			} else {
 				mainTextView.setText(mainText);
-				complTextView.setText(username);
+				complTextView.setText(complText);
 				complTextView.setVisibility(View.VISIBLE);
 			}
 
@@ -536,9 +541,8 @@ public class ConferenceActivity extends ListActivity implements
 
 			ImageView pictureView = (ImageView) v.findViewById(R.id.picture);
 			if (numberOfCalls != 1) {
-				String domain = call.getRemoteAddress().getDomain();
 				// May be greatly sped up using a drawable cache
-				Uri uri = LinphoneUtils.findPictureOfContact(getContentResolver(), username, domain);
+				Uri uri = LinphoneUtils.findUriPictureOfContactAndSetDisplayName(call.getRemoteAddress(), getContentResolver());
 				LinphoneUtils.setImagePictureFromUri(ConferenceActivity.this, pictureView, uri, R.drawable.unknown_person);
 				pictureView.setVisibility(VISIBLE);
 			} else {
diff --git a/src/org/linphone/ContactHelper.java b/src/org/linphone/ContactHelper.java
new file mode 100644
index 000000000..62a7b8717
--- /dev/null
+++ b/src/org/linphone/ContactHelper.java
@@ -0,0 +1,258 @@
+/*
+ContactHelper.java
+Copyright (C) 2011  Belledonne Communications, Grenoble, France
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+package org.linphone;
+
+import org.linphone.core.LinphoneAddress;
+import org.linphone.mediastream.Version;
+
+import android.content.ContentResolver;
+import android.content.ContentUris;
+import android.database.Cursor;
+import android.net.Uri;
+import android.telephony.PhoneNumberUtils;
+import android.text.TextUtils;
+
+public final class ContactHelper {
+
+	private String username;
+	private String domain;
+	private ContentResolver resolver;
+
+
+	private Uri foundPhotoUri;
+	public Uri getUri() {
+		return foundPhotoUri;
+	}
+
+
+	private String displayName;
+//	public String getDisplayName() {
+//		return displayName;
+//	}
+
+	private LinphoneAddress address;
+	public ContactHelper(LinphoneAddress address, ContentResolver resolver) {
+		username = address.getUserName();
+		domain = address.getDomain();
+		this.resolver = resolver;
+		this.address = address;
+	}
+
+	public boolean query() {
+		boolean succeeded;
+		if (Version.sdkAboveOrEqual(Version.API06_ECLAIR_20)) {
+			ContactHelperNew helper = new ContactHelperNew();
+			succeeded = helper.queryNewContactAPI();
+		} else {
+			succeeded = queryOldContactAPI();
+		}
+		if (succeeded && !TextUtils.isEmpty(displayName)) {
+			address.setDisplayName(displayName);
+		}
+		return succeeded;
+	}
+
+
+
+	public static boolean testPhotoUri(Cursor c) {
+		if (c == null) return false;
+		if (!c.moveToNext()) {
+			return false;
+		}
+		byte[] data = c.getBlob(0);
+		if (data == null) {
+			// TODO: simplify all this stuff
+			// which is here only to check that the
+			// photoUri really points to some data.
+			// Not retrieving the data now would be better.
+			return false;
+		}   
+		return true;
+	}
+
+	public static boolean testPhotoUriAndCloseCursor(Cursor c) {
+		boolean valid = testPhotoUri(c);
+		if (c != null) c.close();
+		return valid;
+	}
+		
+	public static boolean testPhotoUri(ContentResolver resolver, Uri photoUriToTest, String photoCol) {
+    	Cursor cursor = resolver.query(photoUriToTest, new String[]{photoCol}, null, null, null);
+    	return testPhotoUriAndCloseCursor(cursor);
+    }
+
+
+	// OLD API
+	@SuppressWarnings("deprecation")
+	private final boolean queryOldContactAPI() {
+		String normalizedNumber = PhoneNumberUtils.getStrippedReversed(username);
+		if (TextUtils.isEmpty(normalizedNumber)) {
+			// non phone username
+			return false;
+		}
+		String[] projection = {android.provider.Contacts.Phones.PERSON_ID, android.provider.Contacts.Phones.DISPLAY_NAME};
+		String selection = android.provider.Contacts.Phones.NUMBER_KEY + "=" + normalizedNumber;
+		Cursor c = resolver.query(android.provider.Contacts.Phones.CONTENT_URI, projection, selection, null, null);
+		if (c == null) return false;
+
+		while (c.moveToNext()) {
+			long id = c.getLong(c.getColumnIndex(android.provider.Contacts.Phones.PERSON_ID));
+			Uri personUri = ContentUris.withAppendedId(android.provider.Contacts.People.CONTENT_URI, id);
+			Uri potentialPictureUri = Uri.withAppendedPath(personUri, android.provider.Contacts.Photos.CONTENT_DIRECTORY);
+			boolean valid = testPhotoUri(resolver, potentialPictureUri, android.provider.Contacts.Photos.DATA);
+			if (valid) {
+				displayName = c.getString(c.getColumnIndex(android.provider.Contacts.Phones.DISPLAY_NAME));
+				foundPhotoUri = personUri; // hack (not returning pictureUri as it crashes when reading from it)
+				c.close();
+				return true;
+			}
+		}
+		c.close();
+		return false;
+	}
+
+	// END OLD API
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	// START NEW CONTACT API
+
+	private class ContactHelperNew {
+		
+		
+		
+		private final boolean checkPhotosUris(ContentResolver resolver, Cursor c, String idCol, String nameCol) {
+			if (c == null) return false;
+			while (c.moveToNext()) {
+				long id = c.getLong(c.getColumnIndex(idCol));
+				Uri contactUri = ContentUris.withAppendedId(android.provider.ContactsContract.Contacts.CONTENT_URI, id);
+				Uri photoUri = Uri.withAppendedPath(contactUri, android.provider.ContactsContract.Contacts.Photo.CONTENT_DIRECTORY);
+				if (photoUri == null) {
+					return false;
+				}
+				String[] projection = {android.provider.ContactsContract.CommonDataKinds.Photo.PHOTO};
+		    	Cursor photoCursor = resolver.query(photoUri, projection, null, null, null);
+				boolean valid = testPhotoUriAndCloseCursor(photoCursor);
+				if (valid) {
+					foundPhotoUri = photoUri;
+					displayName = c.getString(c.getColumnIndex(nameCol));
+					c.close();
+					return true;
+				}
+			}
+			c.close();
+			return false;
+		}
+
+		private final boolean queryNewContactAPI() {
+			String sipUri = username + "@" + domain;
+
+			// Try first using sip field
+			Uri uri = android.provider.ContactsContract.Data.CONTENT_URI;
+			String[] projection = {
+					android.provider.ContactsContract.Data.CONTACT_ID,
+					android.provider.ContactsContract.CommonDataKinds.Phone.DISPLAY_NAME};
+			String selection = new StringBuilder()
+				.append(android.provider.ContactsContract.CommonDataKinds.Im.DATA).append(" =  ? AND ")
+				.append(android.provider.ContactsContract.Data.MIMETYPE)
+				.append(" = '")
+				.append(android.provider.ContactsContract.CommonDataKinds.Im.CONTENT_ITEM_TYPE)
+				.append("' AND lower(")
+				.append(android.provider.ContactsContract.CommonDataKinds.Im.CUSTOM_PROTOCOL)
+				.append(") = 'sip'").toString();
+			Cursor c = resolver.query(uri, projection, selection, new String[] {sipUri}, null);
+			boolean valid = checkPhotosUris(resolver, c,
+					android.provider.ContactsContract.Data.CONTACT_ID,
+					android.provider.ContactsContract.CommonDataKinds.Phone.DISPLAY_NAME);
+			if (valid) return true;
+
+
+			// Then using custom SIP field
+			if (Version.sdkAboveOrEqual(Version.API09_GINGERBREAD_23)) {
+				selection = new StringBuilder()
+					.append(android.provider.ContactsContract.CommonDataKinds.SipAddress.SIP_ADDRESS)
+					.append(" = ? AND ")
+					.append(android.provider.ContactsContract.Data.MIMETYPE)
+					.append(" = '")
+					.append(android.provider.ContactsContract.CommonDataKinds.SipAddress.CONTENT_ITEM_TYPE)
+					.append("'")
+					.toString();
+				c = resolver.query(uri, projection, selection, new String[] {sipUri}, null);
+				valid = checkPhotosUris(resolver, c,
+						android.provider.ContactsContract.Data.CONTACT_ID,
+						android.provider.ContactsContract.CommonDataKinds.Phone.DISPLAY_NAME);
+				if (valid) return true;
+			}
+
+			// Finally using phone number
+			String normalizedNumber = PhoneNumberUtils.getStrippedReversed(username);
+			if (TextUtils.isEmpty(normalizedNumber)) {
+				// non phone username
+				return false;
+			}
+			Uri lookupUri = Uri.withAppendedPath(android.provider.ContactsContract.PhoneLookup.CONTENT_FILTER_URI, Uri.encode(username));
+			projection = new String[]{
+					android.provider.ContactsContract.PhoneLookup._ID,
+					android.provider.ContactsContract.PhoneLookup.NUMBER,
+					android.provider.ContactsContract.PhoneLookup.DISPLAY_NAME};
+			c = resolver.query(lookupUri, projection, null, null, null);
+			while (c.moveToNext()) {
+				long id = c.getLong(c.getColumnIndex(android.provider.ContactsContract.PhoneLookup._ID));
+				String enteredNumber = c.getString(c.getColumnIndex(android.provider.ContactsContract.PhoneLookup.NUMBER));
+				if (!normalizedNumber.equals(PhoneNumberUtils.getStrippedReversed(enteredNumber))) {
+					continue;
+				}
+				
+				Uri contactUri = ContentUris.withAppendedId(android.provider.ContactsContract.Contacts.CONTENT_URI, id);
+				Uri photoUri = Uri.withAppendedPath(contactUri, android.provider.ContactsContract.Contacts.Photo.CONTENT_DIRECTORY);
+				if (photoUri == null) {
+					continue;
+				}
+				String[] photoProj = {android.provider.ContactsContract.CommonDataKinds.Photo.PHOTO};
+				Cursor cursor = resolver.query(photoUri, photoProj, null, null, null);
+				valid = testPhotoUriAndCloseCursor(cursor);
+				if (valid) {
+					displayName = c.getString(c.getColumnIndex(android.provider.ContactsContract.PhoneLookup.DISPLAY_NAME));
+					foundPhotoUri = photoUri;
+					c.close();
+					return true;
+				}
+			}
+			c.close();
+			return false;
+		}
+
+
+	}
+	
+	
+	
+	
+	
+	
+	
+}
diff --git a/src/org/linphone/ContactPickerActivityNew.java b/src/org/linphone/ContactPickerActivityNew.java
index d85a2c5aa..82eafbceb 100644
--- a/src/org/linphone/ContactPickerActivityNew.java
+++ b/src/org/linphone/ContactPickerActivityNew.java
@@ -30,8 +30,6 @@ import android.database.Cursor;
 import android.net.Uri;
 import android.provider.ContactsContract;
 import android.provider.ContactsContract.Contacts;
-import android.provider.ContactsContract.PhoneLookup;
-import android.telephony.PhoneNumberUtils;
 import android.text.TextUtils;
 
 
@@ -55,35 +53,19 @@ public class ContactPickerActivityNew extends AbstractContactPickerActivity {
 
 	@Override
 	public Uri getPhotoUri(String id) {
-		return retrievePhotoUri(getContentResolver(), Long.parseLong(id));
+		return retrievePhotoUriAndSetDisplayName(getContentResolver(), Long.parseLong(id));
 	}
 
-	private static Uri retrievePhotoUri(ContentResolver resolver, long id) {
+	private static Uri retrievePhotoUriAndSetDisplayName(ContentResolver resolver, long id) {
 		Uri contactUri = ContentUris.withAppendedId(Contacts.CONTENT_URI, id);
 		Uri photoUri = Uri.withAppendedPath(contactUri, Contacts.Photo.CONTENT_DIRECTORY);
 		if (photoUri == null) {
 			return null;
 		}
-		String[] projection = {ContactsContract.CommonDataKinds.Photo.PHOTO};
-		Cursor cursor = resolver.query(photoUri, projection, null, null, null);
-		try {
-			if (cursor == null || !cursor.moveToNext()) {
-				return null;
-			}
-			byte[] data = cursor.getBlob(0);
-			if (data == null) {
-				// TODO: simplify all this stuff
-				// which is here only to check that the
-				// photoUri really points to some data.
-				// Not retrieving the data now would be better.
-				return null;
-			}
+		if (ContactHelper.testPhotoUri(resolver, photoUri, ContactsContract.CommonDataKinds.Photo.PHOTO)) {
 			return photoUri;
-		} finally {
-			if (cursor != null) {
-				cursor.close();
-			}
 		}
+		return null;
 	}
 
 	protected List<String> extractPhones(String id) {
@@ -218,76 +200,4 @@ public class ContactPickerActivityNew extends AbstractContactPickerActivity {
 	}
 
 
-	private static Uri retrievePhotoUri(ContentResolver resolver, Cursor c, String column) {
-		if (c == null) return null;
-		while (c.moveToNext()) {
-			long id = c.getLong(c.getColumnIndex(column));
-			Uri picture = retrievePhotoUri(resolver, id);
-			if (picture != null) {
-				c.close();
-				return picture;
-			}
-		}
-		c.close();
-		return null;
-	}
-	public static Uri findUriPictureOfContact(ContentResolver resolver, String username, String domain) {
-		Uri retrievedPictureUri = null;
-		String sipUri = username + "@" + domain;
-
-		// Try first using sip field
-		Uri uri = ContactsContract.Data.CONTENT_URI;
-		String[] projection = {ContactsContract.Data.CONTACT_ID};
-		String selection = new StringBuilder()
-			.append(ContactsContract.CommonDataKinds.Im.DATA).append(" =  ? AND ")
-			.append(ContactsContract.Data.MIMETYPE)
-			.append(" = '")
-			.append(ContactsContract.CommonDataKinds.Im.CONTENT_ITEM_TYPE)
-			.append("' AND lower(")
-			.append(ContactsContract.CommonDataKinds.Im.CUSTOM_PROTOCOL)
-			.append(") = 'sip'").toString();
-		Cursor c = resolver.query(uri, projection, selection, new String[] {sipUri}, null);
-		retrievedPictureUri = retrievePhotoUri(resolver, c, ContactsContract.Data.CONTACT_ID);
-		if (retrievedPictureUri != null) return retrievedPictureUri;
-
-
-		// Then using custom SIP field
-		if (Version.sdkAboveOrEqual(Version.API09_GINGERBREAD_23)) {
-			selection = new StringBuilder()
-				.append(ContactsContract.CommonDataKinds.SipAddress.SIP_ADDRESS)
-				.append(" = ? AND ")
-				.append(ContactsContract.Data.MIMETYPE)
-				.append(" = '")
-				.append(ContactsContract.CommonDataKinds.SipAddress.CONTENT_ITEM_TYPE)
-				.append("'")
-				.toString();
-			c = resolver.query(uri, projection, selection, new String[] {sipUri}, null);
-			retrievedPictureUri = retrievePhotoUri(resolver, c, ContactsContract.Data.CONTACT_ID);
-			if (retrievedPictureUri != null) return retrievedPictureUri;
-		}
-
-		// Finally using phone number
-		String normalizedNumber = PhoneNumberUtils.getStrippedReversed(username);
-		if (TextUtils.isEmpty(normalizedNumber)) {
-			// non phone username
-			return null;
-		}
-		Uri lookupUri = Uri.withAppendedPath(PhoneLookup.CONTENT_FILTER_URI, Uri.encode(username));
-		projection = new String[]{PhoneLookup._ID, PhoneLookup.NUMBER};
-		c = resolver.query(lookupUri, projection, null, null, null);
-		while (c.moveToNext()) {
-			long id = c.getLong(c.getColumnIndex(PhoneLookup._ID));
-			String enteredNumber = c.getString(c.getColumnIndex(PhoneLookup.NUMBER));
-			if (!normalizedNumber.equals(PhoneNumberUtils.getStrippedReversed(enteredNumber))) {
-				continue;
-			}
-			Uri picture = retrievePhotoUri(resolver, id);
-			if (picture != null) {
-				c.close();
-				return picture;
-			}
-		}
-		c.close();
-		return null;
-	}
 }
diff --git a/src/org/linphone/ContactPickerActivityOld.java b/src/org/linphone/ContactPickerActivityOld.java
index e4be622cf..56347519e 100644
--- a/src/org/linphone/ContactPickerActivityOld.java
+++ b/src/org/linphone/ContactPickerActivityOld.java
@@ -19,7 +19,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 package org.linphone;
 
 import android.app.Activity;
-import android.content.ContentResolver;
 import android.content.ContentUris;
 import android.content.Intent;
 import android.database.Cursor;
@@ -27,9 +26,6 @@ import android.net.Uri;
 import android.os.Bundle;
 import android.provider.Contacts;
 import android.provider.Contacts.People;
-import android.provider.Contacts.Photos;
-import android.telephony.PhoneNumberUtils;
-import android.text.TextUtils;
 
 @SuppressWarnings("deprecation")
 public class ContactPickerActivityOld extends Activity {
@@ -51,29 +47,6 @@ public class ContactPickerActivityOld extends Activity {
 
 	}
 
-    private Uri getPhotoUri(Uri photoUriToTest) {
-		return retrievePhotoUri(getContentResolver(), photoUriToTest);
-	}
-
-	private static Uri retrievePhotoUri(ContentResolver resolver, Uri photoUriToTest) {
-    	Cursor cursor = resolver.query(photoUriToTest, new String[]{Photos.DATA}, null, null, null);
-    	try {
-    		if (cursor == null || !cursor.moveToNext()) {
-    			return null;
-    		}   
-    		byte[] data = cursor.getBlob(0);
-    		if (data == null) {
-    			// TODO: simplify all this stuff
-				// which is here only to check that the
-				// photoUri really points to some data.
-				// Not retrieving the data now would be better.
-    			return null;
-    		}   
-    		return photoUriToTest;
-    	} finally {
-    		if (cursor != null) cursor.close();
-    	}   
-    }   
 
 	protected void onActivityResult(int requestCode, int resultCode,
             Intent data) {
@@ -92,8 +65,10 @@ public class ContactPickerActivityOld extends Activity {
                     String lPhoneNo = lCur.getString(lCur.getColumnIndex(People.NUMBER));
                     long id = lCur.getLong(lCur.getColumnIndex(People._ID));
                     Uri personUri = ContentUris.withAppendedId(People.CONTENT_URI, id);
-                    Uri potentialPictureUri = Uri.withAppendedPath(personUri, Contacts.Photos.CONTENT_DIRECTORY);
-                    Uri pictureUri = getPhotoUri(potentialPictureUri);
+                    Uri pictureUri = Uri.withAppendedPath(personUri, Contacts.Photos.CONTENT_DIRECTORY);
+                    if (!ContactHelper.testPhotoUri(getContentResolver(), pictureUri, Contacts.Photos.CONTENT_DIRECTORY)) {
+                    	pictureUri = null;
+                    }
                     // FIXME surprisingly all this picture stuff doesn't seem to work
                     DialerActivity.instance().setContactAddress(lPhoneNo, lName, pictureUri);
                 }
@@ -103,32 +78,4 @@ public class ContactPickerActivityOld extends Activity {
             }
         }
 
-	private static Uri retrievePhotoUriAndCloseC(ContentResolver resolver, Cursor c, String column) {
-		if (c == null) return null;
-		while (c.moveToNext()) {
-			long id = c.getLong(c.getColumnIndex(column));
-            Uri personUri = ContentUris.withAppendedId(People.CONTENT_URI, id);
-			Uri potentialPictureUri = Uri.withAppendedPath(personUri, Contacts.Photos.CONTENT_DIRECTORY);
-			Uri pictureUri = retrievePhotoUri(resolver, potentialPictureUri);
-			if (pictureUri != null) {
-				c.close();
-				return personUri; // FIXME, see LinphoneUtils
-			}
-		}
-		c.close();
-		return null;
-	}
-
-	public static Uri findUriPictureOfContact(ContentResolver resolver, String username, String domain) {
-		String normalizedNumber = PhoneNumberUtils.getStrippedReversed(username);
-		if (TextUtils.isEmpty(normalizedNumber)) {
-			// non phone username
-			return null;
-		}
-		String[] projection = {Contacts.Phones.PERSON_ID};
-		String selection = Contacts.Phones.NUMBER_KEY + "=" + normalizedNumber;
-		Cursor c = resolver.query(Contacts.Phones.CONTENT_URI, projection, selection, null, null);
-		
-		return retrievePhotoUriAndCloseC(resolver, c, Contacts.Phones.PERSON_ID);
-	}
 }
diff --git a/src/org/linphone/IncomingCallActivity.java b/src/org/linphone/IncomingCallActivity.java
index 2ce2e12bf..5384f073a 100644
--- a/src/org/linphone/IncomingCallActivity.java
+++ b/src/org/linphone/IncomingCallActivity.java
@@ -84,14 +84,18 @@ public class IncomingCallActivity extends Activity implements OnClickListener {
 			return;
 		}
 		LinphoneAddress address = mCall.getRemoteAddress();
-		String from = LinphoneManager.extractADisplayName(getResources(), address);
-		mNameView.setText(from);
-		mNumberView.setText(address.asStringUriOnly());
-		String username = address.getUserName();
-		String domain = address.getDomain();
 		// May be greatly sped up using a drawable cache
-		Uri uri = LinphoneUtils.findPictureOfContact(getContentResolver(), username, domain);
+		Uri uri = LinphoneUtils.findUriPictureOfContactAndSetDisplayName(address, getContentResolver());
 		LinphoneUtils.setImagePictureFromUri(this, mPictureView, uri, R.drawable.unknown_person);
+
+		// To be done after findUriPictureOfContactAndSetDisplayName called
+		mNameView.setText(address.getDisplayName());
+		if (getResources().getBoolean(R.bool.show_full_remote_address_on_incoming_call)) {
+			mNumberView.setText(address.asStringUriOnly());
+		} else {
+			mNumberView.setText("");
+		}
+		
 	}
 
 	@Override
diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java
index 7279897fb..045c1188e 100644
--- a/src/org/linphone/LinphoneManager.java
+++ b/src/org/linphone/LinphoneManager.java
@@ -917,7 +917,7 @@ public final class LinphoneManager implements LinphoneCoreListener {
 			return extractADisplayName(r, linphoneAddress);
 
 		if (linphoneAddress != null)
-			return linphoneAddress.toString();
+			return linphoneAddress.asStringUriOnly();
 
 		return r.getString(R.string.unknown_incoming_call_name);
 	}
diff --git a/src/org/linphone/LinphoneUtils.java b/src/org/linphone/LinphoneUtils.java
index 1a3022927..e3d6c628e 100644
--- a/src/org/linphone/LinphoneUtils.java
+++ b/src/org/linphone/LinphoneUtils.java
@@ -23,6 +23,7 @@ import java.io.InputStream;
 import java.net.MalformedURLException;
 import java.net.URL;
 
+import org.linphone.core.LinphoneAddress;
 import org.linphone.core.Log;
 import org.linphone.mediastream.Version;
 import org.linphone.mediastream.video.capture.hwconf.Hacks;
@@ -81,12 +82,10 @@ public final class LinphoneUtils {
 	 * @param contact sip uri
 	 * @return url/uri of the resource
 	 */
-	public static Uri findPictureOfContact(ContentResolver resolver, String username, String domain) {
-		if (Version.sdkAboveOrEqual(Version.API06_ECLAIR_20)) {
-			return ContactPickerActivityNew.findUriPictureOfContact(resolver, username, domain);
-		} else {
-			return ContactPickerActivityOld.findUriPictureOfContact(resolver, username, domain);
-		}
+	public static Uri findUriPictureOfContactAndSetDisplayName(LinphoneAddress address, ContentResolver resolver) {
+		ContactHelper helper = new ContactHelper(address, resolver);
+		helper.query();
+		return helper.getUri();
 	}
 	
 	public static Bitmap downloadBitmap(Uri uri) {

From 9f1ee3f8681efb1335dbd3899966e586258cc49b Mon Sep 17 00:00:00 2001
From: Guillaume Beraudo <guillaume.beraudo@belledonne-communications.com>
Date: Fri, 7 Oct 2011 09:52:59 +0200
Subject: [PATCH 28/62] Enhance conference activity style + permute calls.

---
 AndroidManifest.xml                         |   2 +-
 res/drawable/conf_permute.png               | Bin 0 -> 1029 bytes
 res/drawable/numpad_big.png                 | Bin 0 -> 1657 bytes
 res/drawable/plus.png                       | Bin 0 -> 1937 bytes
 res/layout/conferencing.xml                 |  54 ++++++------
 res/values/callee_style.xml                 |   2 +
 res/values/conf_style.xml                   |  12 +++
 res/values/strings.xml                      |   7 +-
 src/org/linphone/ConferenceActivity.java    |  86 ++++++++++++++------
 src/org/linphone/LinphoneUtils.java         |   7 ++
 src/org/linphone/core/LinphoneCoreImpl.java |   4 +-
 submodules/linphone                         |   2 +-
 12 files changed, 120 insertions(+), 56 deletions(-)
 create mode 100644 res/drawable/conf_permute.png
 create mode 100644 res/drawable/numpad_big.png
 create mode 100644 res/drawable/plus.png
 create mode 100644 res/values/conf_style.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 5f3d7662b..4e73fb38a 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -61,7 +61,7 @@
             </intent-filter>
          </activity>
 		<activity android:name="org.linphone.ConferenceActivity"
-        			android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
+        			android:theme="@android:style/Theme.NoTitleBar"
         			android:screenOrientation="portrait">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/res/drawable/conf_permute.png b/res/drawable/conf_permute.png
new file mode 100644
index 0000000000000000000000000000000000000000..225b8bf7d6c7b6952324d9fa961e417f656c43f9
GIT binary patch
literal 1029
zcmV+g1p51lP)<h;3K|Lk000e1NJLTq000>P000*V1^@s6{^R5m00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01ejw01ejxLMWSf00007bV*G`2ipn;
z4Hpp08U~O600V_dL_t(Y$F<c>Y?M_L2H@wLnGOUSL8G+L@ds>yb`*?;xFN7|;R1~s
z6EX{faRD09m=Hz5I@F+sXrd<S!k{L?h>05G#*HLWj3#Q02m`H_2($=AwEP7vZRc~*
zJMENCsT<Gg-uvBq-tWBc`Qd-EuKe85b?U!7=+5OP{nl70jIMj0%s5vYi=)U;Y3xpP
zIp>|*?v~nBJLOLdF4(OUBOY^?9vss2(uwMk#3;6Aq-NGjr>``>uzkvCN~LImlQO`B
zNIEy&U^p=hYOcA-g2#7PrLB^p^4UORyGnwxZ9Nk;DL$7m9E|`-)`-$Gpcc2HH#pCP
zbsc)}dt;$6A<ELwc!E-J@R<gc5l7Q%HLd+(HCAFN4wZEd&ac7`_ynI_N?#&%(SeO~
zv}`#(vWHSl1wvw`mJRzp#(TIIvyiNycM$z(!E0F8SSTzL$K&XVlL^KAwIjO&`37+a
zBiq)S#;bU&EE8VDp0F>|H4je*D(mnUHWl*?Z;z*h?B-rk@%aq#D8LH5jGM6yTXA@j
zq`EPHK8)2kji-vO*S#~6qk)(>At9dd_&5r9_A&s_jI($MJCVl5Y+KJAQH9S^q9iqf
z8o@<$U_DNRKby?%!Va9mgZKukFdeBl85^Z7CQ(r;wYVR1uqiyc9m@hWmDUjM&&LMb
zgI}==zh(2sCZ=$(g?J%6z9O8R!3F$;M=R+25?w*N<tX99kRZds$N5oRDnOE`!Hm#d
z`U8*E`rBb_3F|+D)0KD~A7D+kt+#e8l2J*tU}o5z38L=BoA{+l66_32JQ0fY`fxrQ
zx8N&uh)B&yrd%iu30fpW&hNk@sK<{%*lM;tXt4xY{DC7lSZvL7jMPd(YF_@Z{jHgD
z*zkF%kvoIn>#zv#hQe#d)gj`ppjT(0`FM9OH?CP`^GC<{?s{dZh3mgxgTl$5KRq{l
z@qJAJU|qO!HaI#MYH2_E@LlL*seSp(=|ririIL6sju-XFM{Cv8H%r$olCE!7y3lXd
z+$F1U8y*N+EeVtk;w^lOz1_Lo$;t?Z6A6p+N2^c9V_$DGy<wqrU9-WyP8a(+oquDO
z#zJ9P=*BC`tsni}xm>aG{XkQ@<lp~TwDr`~<M;gOUITpx^lyHD(y||DY&WfY`DN$+
zlr#R)VKmURhd3sR5Q}0;aV*<;%%PfGRRH)GMsp;xyL|jY00000NkvXXu0mjfR-5Q%

literal 0
HcmV?d00001

diff --git a/res/drawable/numpad_big.png b/res/drawable/numpad_big.png
new file mode 100644
index 0000000000000000000000000000000000000000..2f17068694377fdba303fe2d5185da49b6bce007
GIT binary patch
literal 1657
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
D;xQ{+

literal 0
HcmV?d00001

diff --git a/res/drawable/plus.png b/res/drawable/plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..20327957a8f4107947a86a16050586d8bb625426
GIT binary patch
literal 1937
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
Xhq81V$vPHw00000NkvXXu0mjfg$tbI

literal 0
HcmV?d00001

diff --git a/res/layout/conferencing.xml b/res/layout/conferencing.xml
index a0d20e514..175a8c470 100644
--- a/res/layout/conferencing.xml
+++ b/res/layout/conferencing.xml
@@ -7,35 +7,36 @@
          android:paddingRight="8dp">
 
 
-	<LinearLayout android:id="@+id/conf_header" android:layout_alignParentTop="true"
+	<LinearLayout android:id="@+id/conf_control_buttons" 
+		android:layout_width="fill_parent" android:layout_height="wrap_content"
+		android:layout_alignParentTop="true">
+		<Button android:id="@+id/conf_simple_permute" style="@style/conf_icon_text_button"
+			android:drawableTop="@drawable/conf_permute" android:text="@string/conf_simple_permute_bt_txt"/>
+		<Button android:id="@+id/conf_simple_merge" style="@style/conf_icon_text_button"
+			android:drawableTop="@drawable/conf_merge" 
+		 	android:text="@string/conf_simple_merge_bt_txt"/>
+		<Button android:id="@+id/conf_simple_transfer" style="@style/conf_icon_text_button"
+			android:drawableTop="@drawable/conf_transfer"
+			android:text="@string/conf_simple_transfer_bt_txt" />
+	</LinearLayout>
+
+	<LinearLayout android:id="@+id/conf_header" android:layout_below="@id/conf_control_buttons"
 			android:orientation="vertical" android:layout_marginBottom="10dip"
-			android:layout_width="fill_parent" android:layout_height="wrap_content" >
+			android:layout_width="fill_parent" android:layout_height="wrap_content" 
+			android:layout_alignWithParentIfMissing="true">
       	<TextView android:text="@string/conf_text_you_host_a_conference"
         	android:layout_width="fill_parent" android:layout_height="wrap_content" 
         	android:gravity="center"/>
-<!--      	<TextView android:id="@+id/conf_self_attending"-->
-<!--        	android:layout_width="fill_parent" android:layout_height="wrap_content"/>-->
 	</LinearLayout>
 
 
 
 
 
-	<LinearLayout android:id="@+id/conf_bottom_row" android:layout_alignParentBottom="true"
-		android:layout_width="fill_parent" android:layout_height="wrap_content">
-		<Button android:text="@string/AddCallButtonText" android:id="@+id/addCall"
-	     android:layout_width="wrap_content" android:layout_height="wrap_content" />
-
-		<org.linphone.ui.HangCallButton android:id="@+id/incallHang" android:layout_width="0dip" android:layout_height="wrap_content"
-		 android:src="@drawable/mini_stopcall_red"  android:layout_weight="1" />
-		 
-		<Button android:id="@+id/incallNumpadShow" android:text="@string/show_send_dtmfs_button"  
-		 android:layout_width="wrap_content" android:layout_height="wrap_content"/>
-	</LinearLayout>
 
 
-	<LinearLayout android:id="@+id/conf_menu_row" 
-			android:layout_above="@id/conf_bottom_row"
+	<LinearLayout android:id="@+id/conf_speaker_mic_row" 
+			android:layout_alignParentBottom="true" 
 			android:layout_width="fill_parent" android:layout_height="wrap_content"> 
 	<ToggleButton android:id="@+id/toggleMuteMic" style="@style/conf_toggle_button" 
 		android:textOn="@string/mutemic_button_txt" android:textOff="@string/mutemic_button_txt" />
@@ -46,15 +47,20 @@
 		android:visibility="gone"/>
 	</LinearLayout>
 
-	<LinearLayout android:id="@+id/conf_simple_actions" android:visibility="visible" 
-		android:layout_width="fill_parent" android:layout_height="wrap_content"
-		android:layout_above="@id/conf_menu_row"
-		android:layout_centerInParent="true">
-		<Button android:id="@+id/conf_simple_merge" android:text="@string/conf_simple_merge" android:visibility="gone"
-			android:layout_width="wrap_content" android:layout_height="wrap_content" />
+	<LinearLayout android:id="@+id/conf_terminate_row"
+		android:layout_above="@id/conf_speaker_mic_row"
+		android:layout_width="fill_parent" android:layout_height="wrap_content">
+		<Button android:text="@string/AddCallButtonText" android:id="@+id/addCall"
+			style="@style/conf_icon_text_button" android:drawableTop="@drawable/plus" />
+
+		<Button	android:id="@+id/incallHang" style="@style/conf_icon_text_button"
+			android:drawableTop="@drawable/stopcall_red" android:text="@string/hangup"/>
+
+		<Button android:id="@+id/incallNumpadShow" style="@style/conf_icon_text_button"
+			android:text="@string/show_send_dtmfs_button" android:drawableTop="@drawable/numpad_big" />
 	</LinearLayout>
 
-	<FrameLayout android:id="@+id/incall_picture_box" android:layout_above="@id/conf_simple_actions"
+	<FrameLayout android:id="@+id/incall_picture_box" android:layout_above="@id/conf_terminate_row"
 			android:layout_height="wrap_content" android:layout_width="wrap_content"
 			android:layout_centerInParent="true">
 		<ImageView android:id="@+id/incall_picture" android:visibility="gone"
diff --git a/res/values/callee_style.xml b/res/values/callee_style.xml
index 37a3edcc6..a6fe15731 100644
--- a/res/values/callee_style.xml
+++ b/res/values/callee_style.xml
@@ -5,6 +5,8 @@
         <item name="android:layout_height">fill_parent</item>
         <item name="android:layout_weight">1</item>
         <item name="android:gravity">fill_vertical</item>
+        <item name="android:singleLine">true</item>
+        <item name="android:ellipsize">marquee</item>
     </style>
 
     <style name="callee_address" parent="@android:style/TextAppearance.Medium">
diff --git a/res/values/conf_style.xml b/res/values/conf_style.xml
new file mode 100644
index 000000000..3aa046546
--- /dev/null
+++ b/res/values/conf_style.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="conf_icon_text_button" parent="@android:style/Widget.Button">
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_width">0dip</item>
+        <item name="android:layout_weight">1</item>
+        <item name="android:gravity">bottom|center_horizontal</item>
+        <item name="android:paddingLeft">15sp</item>
+        <item name="android:paddingRight">15sp</item>
+    </style>
+
+</resources>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 020dafc25..a53ef3e49 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -41,8 +41,11 @@
 	<string name="conf_choice_remove_from_conference">Remove from the conference</string>
 	<string name="conf_choice_terminate">Terminate</string>
 
-	<string name="conf_simple_merge">Merge calls</string>
-	
+	<string name="hangup">Hang up</string>
+	<string name="conf_simple_merge_bt_txt">Merge</string>
+	<string name="conf_simple_transfer_bt_txt">Transfer</string>
+	<string name="conf_simple_permute_bt_txt">Permute</string>
+	<string name="conf_simple_no_current_call">No active call</string>
 	<string name="show_send_dtmfs_button">DTMFs</string>
 
 	<string name="conf_text_you_host_a_conference">You host a conference</string>
diff --git a/src/org/linphone/ConferenceActivity.java b/src/org/linphone/ConferenceActivity.java
index 146d4a789..477878e71 100644
--- a/src/org/linphone/ConferenceActivity.java
+++ b/src/org/linphone/ConferenceActivity.java
@@ -76,9 +76,8 @@ public class ConferenceActivity extends ListActivity implements
 		return LinphoneManager.getLc();
 	}
 
-	@SuppressWarnings("unchecked")
 	protected List<LinphoneCall> getInitialCalls() {
-		return lc().getCalls();
+		return LinphoneUtils.getLinphoneCalls(lc());
 	}
 
 	// End override to test block
@@ -92,7 +91,10 @@ public class ConferenceActivity extends ListActivity implements
 
 
 
+	@SuppressWarnings("unused")
 	private void workaroundStatusBarBug() {
+		// call from onCreate to get a clean display on full screen no icons
+		// otherwise the upper side of the activity may be corrupted
 		getWindow().setFlags(
 				WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS,
 				WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS);
@@ -114,30 +116,33 @@ public class ConferenceActivity extends ListActivity implements
 		confHeaderView.setOnClickListener(this);
 
 		findViewById(R.id.addCall).setOnClickListener(this);
-		findViewById(R.id.incallHang).setOnClickListener(this);
 
 		findViewById(R.id.incallNumpadShow).setOnClickListener(this);
 		findViewById(R.id.conf_simple_merge).setOnClickListener(this);
+		findViewById(R.id.conf_simple_transfer).setOnClickListener(this);
+		findViewById(R.id.conf_simple_permute).setOnClickListener(this);
 
 		findViewById(R.id.toggleMuteMic).setOnClickListener(this);
 		findViewById(R.id.toggleSpeaker).setOnClickListener(this);
 
 		waitHelper = new LinphoneManagerWaitHelper(this, this);
 		waitHelper.doManagerDependentOnCreate();
-		workaroundStatusBarBug();
+//		workaroundStatusBarBug();
 	}
 
 	@Override
 	public void onCreateWhenManagerReady() {
 		List<LinphoneCall> calls = getInitialCalls();
 		setListAdapter(new CalleeListAdapter(calls));
+		
+		findViewById(R.id.incallHang).setOnClickListener(this);
 	}
 	@Override
 	public void onResumeWhenManagerReady() {
 		registerLinphoneListener(true);
 		updateCalleeImage();
 		updateConfState();
-		updateMergeButtonState();
+		updateSimpleControlButtons();
 	}
 
 	@Override
@@ -251,6 +256,7 @@ public class ConferenceActivity extends ListActivity implements
 			intent.putExtra(UriPickerActivity.EXTRA_PICKER_TYPE, UriPickerActivity.EXTRA_PICKER_TYPE_ADD);
 			startActivityForResult(intent, ID_ADD_CALL);
 			pauseCurrentCallOrLeaveConference();
+			updateConfState();
 			break;
 		case R.id.conf_header:
 			View content = getLayoutInflater().inflate(R.layout.conf_choices_admin, null);
@@ -261,12 +267,15 @@ public class ConferenceActivity extends ListActivity implements
 					switch (v.getId()) {
 					case R.id.conf_add_all_to_conference_button:
 						lc().addAllToConference();
+						updateConfState();
 						break;
 					case R.id.conf_enter_button:
 						lc().enterConference();
+						updateConfState();
 						break;
 					case R.id.conf_leave_button:
 						lc().leaveConference();
+						updateConfState();
 						break;
 					case R.id.conf_terminate_button:
 						lc().terminateConference();
@@ -294,8 +303,27 @@ public class ConferenceActivity extends ListActivity implements
 			showDialog(numpad_dialog_id);
 			break;
 		case R.id.conf_simple_merge:
+			findViewById(R.id.conf_control_buttons).setVisibility(GONE);
 			lc().addAllToConference();
 			break;
+		case R.id.conf_simple_transfer:
+			findViewById(R.id.conf_control_buttons).setVisibility(GONE);
+			LinphoneCall tCall = lc().getCurrentCall();
+			if (tCall != null) {
+				prepareForTransferingExistingCall(tCall);
+			} else {
+				Toast.makeText(this, R.string.conf_simple_no_current_call, Toast.LENGTH_SHORT).show();
+			}
+			break;
+		case R.id.conf_simple_permute:
+			findViewById(R.id.conf_control_buttons).setVisibility(GONE);
+			for (LinphoneCall call : LinphoneUtils.getLinphoneCalls(lc())) {
+				if (State.Paused == call.getState()) {
+					lc().resumeCall(call);
+					break;
+				}
+			}
+			break;
 		case R.id.toggleMuteMic:
 			lc().muteMic(((ToggleButton) v).isChecked());
 			break;
@@ -312,6 +340,23 @@ public class ConferenceActivity extends ListActivity implements
 
 	}
 
+	private void prepareForTransferingExistingCall(final LinphoneCall call) {
+		final List<LinphoneCall> existingCalls = LinphoneUtils.getLinphoneCalls(lc());
+		existingCalls.remove(call);
+		final List<String> numbers = new ArrayList<String>(existingCalls.size());
+		Resources r = getResources();
+		for(LinphoneCall c : existingCalls) {
+			numbers.add(LinphoneManager.extractADisplayName(r, c.getRemoteAddress()));
+		}
+		ListAdapter adapter = new ArrayAdapter<String>(ConferenceActivity.this, android.R.layout.select_dialog_item, numbers);
+		DialogInterface.OnClickListener l = new DialogInterface.OnClickListener() {
+			public void onClick(DialogInterface dialog, int which) {
+				lc().transferCallToAnother(call, existingCalls.get(which));
+			}
+		};
+		new AlertDialog.Builder(ConferenceActivity.this).setAdapter(adapter, l).create().show();
+	}
+
 	private class CallActionListener implements OnClickListener {
 		private LinphoneCall call;
 		private Dialog dialog;
@@ -344,20 +389,7 @@ public class ConferenceActivity extends ListActivity implements
 				}
 				break;
 			case R.id.transfer_existing:
-				@SuppressWarnings("unchecked") final List<LinphoneCall> existingCalls = lc().getCalls();
-				existingCalls.remove(call);
-				final List<String> numbers = new ArrayList<String>(existingCalls.size());
-				Resources r = getResources();
-				for(LinphoneCall c : existingCalls) {
-					numbers.add(LinphoneManager.extractADisplayName(r, c.getRemoteAddress()));
-				}
-				ListAdapter adapter = new ArrayAdapter<String>(ConferenceActivity.this, android.R.layout.select_dialog_item, numbers);
-				DialogInterface.OnClickListener l = new DialogInterface.OnClickListener() {
-					public void onClick(DialogInterface dialog, int which) {
-						lc().transferCallToAnother(call, existingCalls.get(which));
-					}
-				};
-				new AlertDialog.Builder(ConferenceActivity.this).setAdapter(adapter, l).create().show();
+				prepareForTransferingExistingCall(call);
 				break;
 			case R.id.transfer_new:
 				Intent intent = new Intent().setClass(ConferenceActivity.this, UriPickerActivity.class);
@@ -429,6 +461,7 @@ public class ConferenceActivity extends ListActivity implements
 		}
 
 		public View getView(int position, View v, ViewGroup parent) {
+			Log.i("ConferenceActivity.getView(",position,") out of ", linphoneCalls.size());
 			if (v == null) {
 				if (Version.sdkAboveOrEqual(Version.API06_ECLAIR_20)) {
 					v = getLayoutInflater().inflate(R.layout.conf_callee, null);
@@ -542,7 +575,7 @@ public class ConferenceActivity extends ListActivity implements
 			ImageView pictureView = (ImageView) v.findViewById(R.id.picture);
 			if (numberOfCalls != 1) {
 				// May be greatly sped up using a drawable cache
-				Uri uri = LinphoneUtils.findUriPictureOfContactAndSetDisplayName(call.getRemoteAddress(), getContentResolver());
+				Uri uri = LinphoneUtils.findUriPictureOfContactAndSetDisplayName(address, getContentResolver());
 				LinphoneUtils.setImagePictureFromUri(ConferenceActivity.this, pictureView, uri, R.drawable.unknown_person);
 				pictureView.setVisibility(VISIBLE);
 			} else {
@@ -571,13 +604,14 @@ public class ConferenceActivity extends ListActivity implements
 
 	private Handler mHandler = new Handler();
 
-	private void updateMergeButtonState() {
+	private void updateSimpleControlButtons() {
+		LinphoneCall activeCall = lc().getCurrentCall();
+		View controlLayout = findViewById(R.id.conf_control_buttons);
 		int callNb = lc().getCallsNb();
-		int confSize = lc().getConferenceSize();
-		if (lc().isInConference()) confSize--;
-		boolean showSimpleActions = callNb >= 2 && confSize != callNb;
-		findViewById(R.id.conf_simple_merge).setVisibility(showSimpleActions ? VISIBLE : GONE);
+		boolean hide = activeCall == null || callNb !=2 || lc().getConferenceSize() > 0;
+		controlLayout.setVisibility(hide ? GONE : VISIBLE);
 	}
+
 	public void onCallStateChanged(final LinphoneCall call, final State state,
 			final String message) {
 		final String stateStr = call + " " + state.toString();
@@ -586,7 +620,7 @@ public class ConferenceActivity extends ListActivity implements
 			public void run() {
 				CalleeListAdapter adapter = (CalleeListAdapter) getListAdapter();
 				Log.d("ConferenceActivity applying state ",stateStr);
-				updateMergeButtonState();
+				updateSimpleControlButtons();
 				updateCalleeImage();
 				if (state == State.IncomingReceived || state == State.OutgoingRinging) {
 					if (!adapter.linphoneCalls.contains(call)) {
diff --git a/src/org/linphone/LinphoneUtils.java b/src/org/linphone/LinphoneUtils.java
index e3d6c628e..8ff6c91dd 100644
--- a/src/org/linphone/LinphoneUtils.java
+++ b/src/org/linphone/LinphoneUtils.java
@@ -22,8 +22,11 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.util.List;
 
 import org.linphone.core.LinphoneAddress;
+import org.linphone.core.LinphoneCall;
+import org.linphone.core.LinphoneCore;
 import org.linphone.core.Log;
 import org.linphone.mediastream.Version;
 import org.linphone.mediastream.video.capture.hwconf.Hacks;
@@ -124,5 +127,9 @@ public final class LinphoneUtils {
 		}
 	}
 
+	@SuppressWarnings("unchecked")
+	public static final List<LinphoneCall> getLinphoneCalls(LinphoneCore lc) {
+		return (List<LinphoneCall>) lc.getCalls();
+	}
 }
 
diff --git a/src/org/linphone/core/LinphoneCoreImpl.java b/src/org/linphone/core/LinphoneCoreImpl.java
index 8a40cdb9f..0f91922d7 100644
--- a/src/org/linphone/core/LinphoneCoreImpl.java
+++ b/src/org/linphone/core/LinphoneCoreImpl.java
@@ -522,12 +522,12 @@ class LinphoneCoreImpl implements LinphoneCore {
 	public synchronized void terminateAllCalls() {
 		terminateAllCalls(nativePtr);
 	}
-	private native long getCall(long nativePtr, int position);
+	private native Object getCall(long nativePtr, int position);
 	@SuppressWarnings("unchecked") public synchronized List getCalls() {
 		int size = getCallsNb(nativePtr);
 		List<LinphoneCall> calls = new ArrayList<LinphoneCall>(size);
 		for (int i=0; i < size; i++) {
-			calls.add(new LinphoneCallImpl(getCall(nativePtr, i)));
+			calls.add((LinphoneCall)getCall(nativePtr, i));
 		}
 		return calls;
 	}
diff --git a/submodules/linphone b/submodules/linphone
index b7dacbd01..490945660 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit b7dacbd01a6a9f84560033413f000597f469a718
+Subproject commit 490945660d975abd2520f92a95ef781b1eaff7e3

From 7fa8cd1d5c776cbae13319bc4b924f3d1dec9a6b Mon Sep 17 00:00:00 2001
From: Guillaume Beraudo <guillaume.beraudo@belledonne-communications.com>
Date: Fri, 7 Oct 2011 14:43:32 +0200
Subject: [PATCH 29/62] Hide LinphonecallImpl constructor.

linphonecalls should not be created from java.
---
 src/org/linphone/core/LinphoneCallImpl.java | 2 +-
 src/org/linphone/core/LinphoneCoreImpl.java | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/org/linphone/core/LinphoneCallImpl.java b/src/org/linphone/core/LinphoneCallImpl.java
index 3f153e0fc..6370dce17 100644
--- a/src/org/linphone/core/LinphoneCallImpl.java
+++ b/src/org/linphone/core/LinphoneCallImpl.java
@@ -46,7 +46,7 @@ class LinphoneCallImpl implements LinphoneCall {
 	/*
 	 * This method must always be called from JNI, nothing else.
 	 */
-	protected LinphoneCallImpl(long aNativePtr)  {
+	private LinphoneCallImpl(long aNativePtr)  {
 		nativePtr = aNativePtr;
 	}
 	protected void finalize() throws Throwable {
diff --git a/src/org/linphone/core/LinphoneCoreImpl.java b/src/org/linphone/core/LinphoneCoreImpl.java
index 0f91922d7..bf5e5de9c 100644
--- a/src/org/linphone/core/LinphoneCoreImpl.java
+++ b/src/org/linphone/core/LinphoneCoreImpl.java
@@ -560,10 +560,9 @@ class LinphoneCoreImpl implements LinphoneCore {
 		transferCallToAnother(nativePtr, getCallPtr(call), getCallPtr(dest));
 	}
 
-	private native long findCallFromUri(long nativePtr, String uri);
+	private native Object findCallFromUri(long nativePtr, String uri);
 	@Override
 	public synchronized LinphoneCall findCallFromUri(String uri) {
-		long callPtr = findCallFromUri(nativePtr, uri);
-		return callPtr != 0 ? new LinphoneCallImpl(callPtr) : null;
+		return (LinphoneCall) findCallFromUri(nativePtr, uri);
 	}
 }

From 607a5caafeb1142015d0f2deb00c0fde1b5d4fd9 Mon Sep 17 00:00:00 2001
From: Guillaume Beraudo <guillaume.beraudo@belledonne-communications.com>
Date: Fri, 7 Oct 2011 14:46:31 +0200
Subject: [PATCH 30/62] Use LinphoneManagerWait and finish on call terminated.

---
 src/org/linphone/IncomingCallActivity.java | 41 ++++++++++++++++++----
 1 file changed, 34 insertions(+), 7 deletions(-)

diff --git a/src/org/linphone/IncomingCallActivity.java b/src/org/linphone/IncomingCallActivity.java
index 5384f073a..540302b83 100644
--- a/src/org/linphone/IncomingCallActivity.java
+++ b/src/org/linphone/IncomingCallActivity.java
@@ -18,9 +18,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 package org.linphone;
 
+import org.linphone.LinphoneManagerWaitHelper.LinphoneManagerReadyListener;
+import org.linphone.LinphoneSimpleListener.LinphoneOnCallStateChangedListener;
 import org.linphone.core.LinphoneAddress;
 import org.linphone.core.LinphoneCall;
 import org.linphone.core.Log;
+import org.linphone.core.LinphoneCall.State;
 
 import android.app.Activity;
 import android.content.Intent;
@@ -40,12 +43,13 @@ import android.widget.Toast;
  *
  * @author Guillaume Beraudo
  */
-public class IncomingCallActivity extends Activity implements OnClickListener {
+public class IncomingCallActivity extends Activity implements OnClickListener, LinphoneManagerReadyListener, LinphoneOnCallStateChangedListener {
 
 	private TextView mNameView;
 	private TextView mNumberView;
 	private ImageView mPictureView;
 	private LinphoneCall mCall;
+	private LinphoneManagerWaitHelper helper;
 
 	private void findIncomingCall(Intent intent) {
 		String stringUri = intent.getStringExtra("stringUri");
@@ -58,7 +62,6 @@ public class IncomingCallActivity extends Activity implements OnClickListener {
 
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
 		setContentView(R.layout.incoming);
 
 		mNameView = (TextView) findViewById(R.id.incoming_caller_name);
@@ -72,12 +75,17 @@ public class IncomingCallActivity extends Activity implements OnClickListener {
         int flags = WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED;
         flags |= WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD;
         getWindow().addFlags(flags);
+
+        helper = new LinphoneManagerWaitHelper(this, this);
+        super.onCreate(savedInstanceState);
 	}
 
-	
 	@Override
-	protected void onResume() {
-		super.onResume();
+	public void onCreateWhenManagerReady() {}
+
+	@Override
+	public void onResumeWhenManagerReady() {
+		LinphoneManager.getInstance().addListener(this);
 		findIncomingCall(getIntent());
 		if (mCall == null) {
 			finish();
@@ -95,12 +103,23 @@ public class IncomingCallActivity extends Activity implements OnClickListener {
 		} else {
 			mNumberView.setText("");
 		}
-		
 	}
 
+	@Override
+	protected void onResume() {
+		super.onResume();
+        helper.doManagerDependentOnResume();
+	}
+	
+	@Override
+	protected void onPause() {
+		super.onPause();
+		LinphoneManager.getInstance().removeListener(this);
+	}
+	
 	@Override
 	public boolean onKeyDown(int keyCode, KeyEvent event) {
-		if (keyCode == KeyEvent.KEYCODE_BACK || keyCode == KeyEvent.KEYCODE_HOME) {
+		if (LinphoneManager.isInstanciated() && (keyCode == KeyEvent.KEYCODE_BACK || keyCode == KeyEvent.KEYCODE_HOME)) {
 			LinphoneManager.getLc().terminateCall(mCall);
 			finish();
 		}
@@ -124,4 +143,12 @@ public class IncomingCallActivity extends Activity implements OnClickListener {
 		}
 		finish();
 	}
+
+	@Override
+	public void onCallStateChanged(LinphoneCall call, State state, String msg) {
+		if (call == mCall && State.CallEnd == state) {
+			finish();
+		}
+	}
+
 }

From a3202fd10893737684c0a82f810b6972ec90f779 Mon Sep 17 00:00:00 2001
From: Guillaume Beraudo <guillaume.beraudo@belledonne-communications.com>
Date: Fri, 7 Oct 2011 14:47:16 +0200
Subject: [PATCH 31/62] Fix position of onCreate() call on ManagerWait aware
 activities

---
 src/org/linphone/ConferenceActivity.java      | 2 +-
 src/org/linphone/DialerActivity.java          | 2 +-
 src/org/linphone/LinphoneManager.java         | 2 +-
 submodules/linphone                           | 2 +-
 test/org/linphone/TestConferenceActivity.java | 3 ++-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/org/linphone/ConferenceActivity.java b/src/org/linphone/ConferenceActivity.java
index 477878e71..2b481b3d8 100644
--- a/src/org/linphone/ConferenceActivity.java
+++ b/src/org/linphone/ConferenceActivity.java
@@ -110,7 +110,6 @@ public class ConferenceActivity extends ListActivity implements
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		setContentView(R.layout.conferencing);
-		super.onCreate(savedInstanceState);
 
 		confHeaderView = findViewById(R.id.conf_header);
 		confHeaderView.setOnClickListener(this);
@@ -128,6 +127,7 @@ public class ConferenceActivity extends ListActivity implements
 		waitHelper = new LinphoneManagerWaitHelper(this, this);
 		waitHelper.doManagerDependentOnCreate();
 //		workaroundStatusBarBug();
+		super.onCreate(savedInstanceState);
 	}
 
 	@Override
diff --git a/src/org/linphone/DialerActivity.java b/src/org/linphone/DialerActivity.java
index fbc1183d4..c2ca73673 100644
--- a/src/org/linphone/DialerActivity.java
+++ b/src/org/linphone/DialerActivity.java
@@ -106,7 +106,6 @@ public class DialerActivity extends Activity implements LinphoneGuiListener, Lin
 
 	private LinphoneManagerWaitHelper waitHelper;
 	public void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
 		setContentView(R.layout.dialer);
 
 		useIncallActivity = getResources().getBoolean(R.bool.use_incall_activity);
@@ -160,6 +159,7 @@ public class DialerActivity extends Activity implements LinphoneGuiListener, Lin
 		waitHelper = new LinphoneManagerWaitHelper(this, this);
 		waitHelper.doManagerDependentOnCreate();
 		instance = this;
+		super.onCreate(savedInstanceState);
 	}
 
 	@Override
diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java
index 045c1188e..4ada1ec1c 100644
--- a/src/org/linphone/LinphoneManager.java
+++ b/src/org/linphone/LinphoneManager.java
@@ -961,7 +961,7 @@ public final class LinphoneManager implements LinphoneCoreListener {
 		private LinphoneServiceListener serviceListener;
 		List<LinphoneSimpleListener> simpleListeners;
 		public ListenerDispatcher(List<LinphoneSimpleListener> simpleListeners) {
-			this.simpleListeners = simpleListeners;
+			this.simpleListeners = simpleListeners; // yes, really keeps a reference, not a copy
 		}
 
 		@SuppressWarnings("unchecked")
diff --git a/submodules/linphone b/submodules/linphone
index 490945660..0109d8680 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 490945660d975abd2520f92a95ef781b1eaff7e3
+Subproject commit 0109d8680d1dd3985d03854ee1a9670b355a7ba3
diff --git a/test/org/linphone/TestConferenceActivity.java b/test/org/linphone/TestConferenceActivity.java
index 3510de0be..a7cb40db0 100644
--- a/test/org/linphone/TestConferenceActivity.java
+++ b/test/org/linphone/TestConferenceActivity.java
@@ -95,11 +95,12 @@ public class TestConferenceActivity extends ConferenceActivity {
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		LinphoneManagerWaitHelper.disabled=true;
-		super.onCreate(savedInstanceState);
 		//if (!serviceStarted) startService(new Intent(ACTION_MAIN).setClass(this, LinphoneService.class));
 
 		findViewById(R.id.toggleMuteMic).setOnClickListener(null);
 		findViewById(R.id.toggleSpeaker).setOnClickListener(null);
+
+		super.onCreate(savedInstanceState);
 	}
 
 

From 1d1b6983b65ae4b73d07454209f9ea1c01266c7c Mon Sep 17 00:00:00 2001
From: Guillaume Beraudo <guillaume.beraudo@belledonne-communications.com>
Date: Fri, 7 Oct 2011 15:59:25 +0200
Subject: [PATCH 32/62] Add title to transfer dialog.

---
 res/values/strings.xml                   | 3 ++-
 src/org/linphone/ConferenceActivity.java | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index a53ef3e49..c0a6e2af2 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -6,7 +6,8 @@
 
 	<string name="uri_picking_canceled">Canceled</string>
 	<string name="error_adding_new_call">Error adding new call</string>
-	<string name="transfer_started">Transfer started</string>
+	<string name="transfer_started">Transfer initiated</string>
+	<string name="transfer_dialog_title">Transfer call to</string>
 
 	<string name="skipable_error_service_not_ready">Warning: service is not ready</string>
 
diff --git a/src/org/linphone/ConferenceActivity.java b/src/org/linphone/ConferenceActivity.java
index 2b481b3d8..79f0ad409 100644
--- a/src/org/linphone/ConferenceActivity.java
+++ b/src/org/linphone/ConferenceActivity.java
@@ -354,7 +354,7 @@ public class ConferenceActivity extends ListActivity implements
 				lc().transferCallToAnother(call, existingCalls.get(which));
 			}
 		};
-		new AlertDialog.Builder(ConferenceActivity.this).setAdapter(adapter, l).create().show();
+		new AlertDialog.Builder(ConferenceActivity.this).setTitle(R.string.transfer_dialog_title).setAdapter(adapter, l).create().show();
 	}
 
 	private class CallActionListener implements OnClickListener {

From 5ba1181bad2ed6c1aefb1d20d2b600774f2ab50c Mon Sep 17 00:00:00 2001
From: Guillaume Beraudo <guillaume.beraudo@belledonne-communications.com>
Date: Fri, 7 Oct 2011 16:13:44 +0200
Subject: [PATCH 33/62] Dialer exitCall() only if no other call

---
 src/org/linphone/DialerActivity.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/org/linphone/DialerActivity.java b/src/org/linphone/DialerActivity.java
index c2ca73673..2ba3437f7 100644
--- a/src/org/linphone/DialerActivity.java
+++ b/src/org/linphone/DialerActivity.java
@@ -459,15 +459,15 @@ public class DialerActivity extends Activity implements LinphoneGuiListener, Lin
 				enterIncallMode(lc);
 			}
 		}else if (state==LinphoneCall.State.Error){
-			if (lc.getCurrentCall() == null || lc.getCurrentCall()==call){
+			showToast(R.string.call_error, message);
+			if (lc.getCallsNb() == 0){
 				if (mWakeLock.isHeld()) mWakeLock.release();
-				showToast(R.string.call_error, message);
 				exitCallMode();
 				LinphoneActivity.instance().stopOrientationSensor();
 				mCurrentCall=null;
 			}
 		}else if (state==LinphoneCall.State.CallEnd){
-			if (lc.getCurrentCall() == null || lc.getCurrentCall()==call){
+			if (lc.getCallsNb() == 0){
 				exitCallMode();
 				LinphoneActivity.instance().stopOrientationSensor();
 				mCurrentCall=null;

From 9d80634e7fef29bde3b03eaa8d1d50d3d275fd80 Mon Sep 17 00:00:00 2001
From: Guillaume Beraudo <guillaume.beraudo@belledonne-communications.com>
Date: Mon, 10 Oct 2011 10:45:06 +0200
Subject: [PATCH 34/62] Pause linphone SIP calls on phone call received.

---
 AndroidManifest.xml                           |  7 ++-
 src/org/linphone/ConferenceActivity.java      |  3 ++
 .../linphone/PhoneStateChangedReceiver.java   | 48 +++++++++++++++++++
 3 files changed, 56 insertions(+), 2 deletions(-)
 create mode 100644 src/org/linphone/PhoneStateChangedReceiver.java

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 4e73fb38a..5efc5929c 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -123,8 +123,10 @@
 	<receiver android:name="org.linphone.BootReceiver">
 		<intent-filter><action android:name="android.intent.action.BOOT_COMPLETED"></action></intent-filter>
 	</receiver>
-	
-	
+
+	<receiver android:name="org.linphone.PhoneStateChangedReceiver">
+		<intent-filter><action android:name="android.intent.action.PHONE_STATE" /></intent-filter>
+	</receiver>
 	
 	
 		<activity android:name="org.linphone.TestConferenceActivity"
@@ -201,6 +203,7 @@
 <uses-permission android:name="android.permission.CAMERA" />
 <uses-permission android:name="android.permission.READ_LOGS" />
 
+<uses-permission android:name="android.permission.READ_PHONE_STATE" />
 
 <supports-screens android:smallScreens="true" android:normalScreens="true" android:largeScreens="true" android:anyDensity="true"/>
 </manifest> 
diff --git a/src/org/linphone/ConferenceActivity.java b/src/org/linphone/ConferenceActivity.java
index 79f0ad409..f975a1904 100644
--- a/src/org/linphone/ConferenceActivity.java
+++ b/src/org/linphone/ConferenceActivity.java
@@ -143,6 +143,9 @@ public class ConferenceActivity extends ListActivity implements
 		updateCalleeImage();
 		updateConfState();
 		updateSimpleControlButtons();
+		CalleeListAdapter adapter = (CalleeListAdapter) getListAdapter();
+		adapter.notifyDataSetInvalidated();
+		adapter.notifyDataSetChanged();
 	}
 
 	@Override
diff --git a/src/org/linphone/PhoneStateChangedReceiver.java b/src/org/linphone/PhoneStateChangedReceiver.java
new file mode 100644
index 000000000..c5125faa0
--- /dev/null
+++ b/src/org/linphone/PhoneStateChangedReceiver.java
@@ -0,0 +1,48 @@
+/*
+PhoneStateReceiver.java
+Copyright (C) 2011  Belledonne Communications, Grenoble, France
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+package org.linphone;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.telephony.TelephonyManager;
+
+/**
+ * Pause current SIP calls when GSM phone rings or is active.
+ * 
+ * @author Guillaume Beraudo
+ *
+ */
+public class PhoneStateChangedReceiver extends BroadcastReceiver {
+
+	@Override
+	public void onReceive(Context context, Intent intent) {
+		final String extraState = intent.getStringExtra(TelephonyManager.EXTRA_STATE);
+
+		if (TelephonyManager.EXTRA_STATE_RINGING.equals(extraState) || TelephonyManager.EXTRA_STATE_OFFHOOK.equals(extraState)) {
+			if (LinphoneManager.isInstanciated()) {
+				LinphoneManager.getLc().pauseAllCalls();
+			}
+        }
+		
+		// TelephonyManager.EXTRA_STATE_IDLE.equals(extraState)
+		// do nothing
+	}
+
+}

From 2981c17eb08af2aac4c9551fb83bbcd23fcb558b Mon Sep 17 00:00:00 2001
From: Guillaume Beraudo <guillaume.beraudo@belledonne-communications.com>
Date: Mon, 10 Oct 2011 10:49:27 +0200
Subject: [PATCH 35/62] Fix on volume change status not showing.

---
 src/org/linphone/LinphoneUtils.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/org/linphone/LinphoneUtils.java b/src/org/linphone/LinphoneUtils.java
index 8ff6c91dd..528ec3d77 100644
--- a/src/org/linphone/LinphoneUtils.java
+++ b/src/org/linphone/LinphoneUtils.java
@@ -77,7 +77,7 @@ public final class LinphoneUtils {
 		} else if (keyCode == KeyEvent.KEYCODE_VOLUME_DOWN) {
 			LinphoneManager.getInstance().adjustSoftwareVolume(-1);
 		}
-		return !preventVolumeBarToDisplay;
+		return preventVolumeBarToDisplay;
 	}
 
 

From 01674c3b1aa86b3ae23c773f7d8eb0d4ad1a2d12 Mon Sep 17 00:00:00 2001
From: Guillaume Beraudo <guillaume.beraudo@belledonne-communications.com>
Date: Mon, 10 Oct 2011 14:56:02 +0200
Subject: [PATCH 36/62] Fix proximity sensor (conference, uri picker, incall).

---
 src/org/linphone/ConferenceActivity.java |  2 +
 src/org/linphone/DialerActivity.java     |  8 ++-
 src/org/linphone/IncallActivity.java     |  3 +-
 src/org/linphone/LinphoneActivity.java   | 70 +++-----------------
 src/org/linphone/LinphoneManager.java    | 83 ++++++++++++++++++++++++
 src/org/linphone/UriPickerActivity.java  | 11 ++++
 src/org/linphone/VideoCallActivity.java  |  4 --
 7 files changed, 113 insertions(+), 68 deletions(-)

diff --git a/src/org/linphone/ConferenceActivity.java b/src/org/linphone/ConferenceActivity.java
index f975a1904..042a61dbf 100644
--- a/src/org/linphone/ConferenceActivity.java
+++ b/src/org/linphone/ConferenceActivity.java
@@ -146,6 +146,7 @@ public class ConferenceActivity extends ListActivity implements
 		CalleeListAdapter adapter = (CalleeListAdapter) getListAdapter();
 		adapter.notifyDataSetInvalidated();
 		adapter.notifyDataSetChanged();
+		LinphoneManager.startProximitySensorForActivity(this);
 	}
 
 	@Override
@@ -173,6 +174,7 @@ public class ConferenceActivity extends ListActivity implements
 	protected void onPause() {
 		active=false;
 		registerLinphoneListener(false);
+		LinphoneManager.stopProximitySensorForActivity(this);
 		super.onPause();
 	}
 
diff --git a/src/org/linphone/DialerActivity.java b/src/org/linphone/DialerActivity.java
index 2ba3437f7..3c8dd2a9c 100644
--- a/src/org/linphone/DialerActivity.java
+++ b/src/org/linphone/DialerActivity.java
@@ -237,7 +237,7 @@ public class DialerActivity extends Activity implements LinphoneGuiListener, Lin
 
 //		setVolumeControlStream(AudioManager.STREAM_VOICE_CALL);
 
-		LinphoneActivity.instance().startProxymitySensor();
+		LinphoneManager.startProximitySensorForActivity(LinphoneActivity.instance());
 		if (!mWakeLock.isHeld()) mWakeLock.acquire();
 		
 		if (useIncallActivity) {
@@ -319,7 +319,7 @@ public class DialerActivity extends Activity implements LinphoneGuiListener, Lin
 		}
 
 		if (mWakeLock.isHeld()) mWakeLock.release();
-		LinphoneActivity.instance().stopProxymitySensor();
+		LinphoneManager.stopProximitySensorForActivity(LinphoneActivity.instance());
 		
 		setVolumeControlStream(AudioManager.USE_DEFAULT_STREAM_TYPE);
 		mCall.setEnabled(true);
@@ -520,6 +520,10 @@ public class DialerActivity extends Activity implements LinphoneGuiListener, Lin
 		// Note1: We wait as long as possible before setting the last message.
 		// Note2: Linphone service is in charge of instantiating LinphoneManager
 		mStatus.setText(LinphoneManager.getInstance().getLastLcStatusMessage());
+		if (LinphoneManager.getLc().getCallsNb() > 0) {
+			LinphoneManager.startProximitySensorForActivity(LinphoneActivity.instance());
+			// removing is done directly in LinphoneActivity.onPause()
+		}
 	}
 
 	@Override
diff --git a/src/org/linphone/IncallActivity.java b/src/org/linphone/IncallActivity.java
index 6874387b3..d8faa0899 100644
--- a/src/org/linphone/IncallActivity.java
+++ b/src/org/linphone/IncallActivity.java
@@ -102,7 +102,7 @@ public class IncallActivity extends Activity implements OnClickListener {
 	@Override
 	protected void onResume() {
 		super.onResume();
-
+		LinphoneManager.startProximitySensorForActivity(this);
 		task = new TimerTask() {
 			@Override
 			public void run() {
@@ -125,6 +125,7 @@ public class IncallActivity extends Activity implements OnClickListener {
 	@Override
 	protected void onPause() {
 		super.onPause();
+		LinphoneManager.stopProximitySensorForActivity(this);
 
 		if (task != null) {
 			task.cancel();
diff --git a/src/org/linphone/LinphoneActivity.java b/src/org/linphone/LinphoneActivity.java
index b88e16aa5..298108788 100644
--- a/src/org/linphone/LinphoneActivity.java
+++ b/src/org/linphone/LinphoneActivity.java
@@ -21,8 +21,6 @@ package org.linphone;
 
 import static android.content.Intent.ACTION_MAIN;
 
-import java.util.List;
-
 import org.linphone.LinphoneManager.EcCalibrationListener;
 import org.linphone.core.LinphoneAddress;
 import org.linphone.core.LinphoneCore;
@@ -52,8 +50,6 @@ import android.text.Html;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
-import android.view.View;
-import android.view.WindowManager;
 import android.widget.FrameLayout;
 import android.widget.TabWidget;
 import android.widget.TextView;
@@ -77,7 +73,6 @@ public class LinphoneActivity extends TabActivity implements SensorEventListener
 	private SensorManager mSensorManager;
 	private Sensor mAccelerometer;
 	private int previousRotation = -1;
-	private static SensorEventListener mSensorEventListener;
 	
 	private static final String SCREEN_IS_HIDDEN = "screen_is_hidden";
 	private Handler mHandler = new Handler();
@@ -100,14 +95,9 @@ public class LinphoneActivity extends TabActivity implements SensorEventListener
 		throw new RuntimeException("LinphoneActivity not instantiated yet");
 	}
 
-	protected void onSaveInstanceState (Bundle outState) {
-		super.onSaveInstanceState(outState);
-		outState.putBoolean(SCREEN_IS_HIDDEN, mMainFrame.getVisibility() == View.INVISIBLE);
-	}
-
 	public void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
 		instance = this;
+		super.onCreate(savedInstanceState);
 		setContentView(R.layout.main);
 
 		LinphonePreferenceManager.getInstance(this);
@@ -140,10 +130,7 @@ public class LinphoneActivity extends TabActivity implements SensorEventListener
 				checkAccount = false;
 			}
 		}
-		
-	    if (savedInstanceState !=null && savedInstanceState.getBoolean(SCREEN_IS_HIDDEN,false)) {
-	    	hideScreen(true);
-	    }
+
 	}
 	
 	
@@ -271,7 +258,7 @@ public class LinphoneActivity extends TabActivity implements SensorEventListener
 		if  (isFinishing())  {
 			//restore audio settings   
 			LinphoneManager.getInstance().routeAudioToReceiver();
-			stopProxymitySensor();//just in case
+			LinphoneManager.stopProximitySensorForActivity(this);
 			instance = null;
 		}
 	}
@@ -316,39 +303,12 @@ public class LinphoneActivity extends TabActivity implements SensorEventListener
 	}
 
 
-
-	void hideScreen(boolean isHidden) {
-		WindowManager.LayoutParams lAttrs =getWindow().getAttributes(); 
-		if (isHidden) {
-			lAttrs.flags |= WindowManager.LayoutParams.FLAG_FULLSCREEN; 
-			mMainFrame.setVisibility(View.INVISIBLE);
-		} else  {
-			lAttrs.flags &= (~WindowManager.LayoutParams.FLAG_FULLSCREEN); 
-			mMainFrame.setVisibility(View.VISIBLE);
-		}
-		getWindow().setAttributes(lAttrs);
+	public synchronized void stopOrientationSensor() {
+		if (mSensorManager!=null)
+			mSensorManager.unregisterListener(this, mAccelerometer);
 	}
 
-	synchronized void startProxymitySensor() {
-		if (mSensorEventListener != null) {
-			Log.i("proximity sensor already active");
-			return;
-		}
-		List<Sensor> lSensorList = mSensorManager.getSensorList(Sensor.TYPE_PROXIMITY);
-		mSensorEventListener = new SensorEventListener() {
-			public void onSensorChanged(SensorEvent event) {
-				//just ignoring for nexus 1
-				if (event.timestamp == 0) return;
-				instance().hideScreen(LinphoneManager.isProximitySensorNearby(event));
-			}
- 
-			public void onAccuracyChanged(Sensor sensor, int accuracy) {}	
-		};
-		if (lSensorList.size() >0) {
-			mSensorManager.registerListener(mSensorEventListener,lSensorList.get(0),SensorManager.SENSOR_DELAY_UI);
-			Log.i("Proximity sensor detected, registering");
-		}		
-	}
+
 	
 	public synchronized void startOrientationSensor() {
 		if (mSensorManager!=null) {
@@ -360,20 +320,6 @@ public class LinphoneActivity extends TabActivity implements SensorEventListener
 		previousRotation = -1;
 		onSensorChanged(null);
 	}
-	
-	public synchronized void stopOrientationSensor() {
-		if (mSensorManager!=null)
-			mSensorManager.unregisterListener(this, mAccelerometer);
-	}
-
-	protected synchronized void stopProxymitySensor() {
-		if (mSensorManager!=null) {
-			mSensorManager.unregisterListener(mSensorEventListener);
-			mSensorEventListener=null; 
-		}
-		hideScreen(false);
-	}
-
 
 	void showPreferenceErrorDialog(String message) {
 		if (!useMenuSettings) {
@@ -538,6 +484,8 @@ public class LinphoneActivity extends TabActivity implements SensorEventListener
 	}
 }
 
+
+
 interface ContactPicked {
 	void setAddressAndGoToDialer(String number, String name, Uri photo);
 }
\ No newline at end of file
diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java
index 4ada1ec1c..fe1e14262 100644
--- a/src/org/linphone/LinphoneManager.java
+++ b/src/org/linphone/LinphoneManager.java
@@ -40,7 +40,9 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 import java.util.Timer;
 import java.util.TimerTask;
 
@@ -69,6 +71,7 @@ import org.linphone.mediastream.video.capture.hwconf.AndroidCameraConfiguration;
 import org.linphone.mediastream.video.capture.hwconf.Hacks;
 import org.linphone.mediastream.video.capture.hwconf.AndroidCameraConfiguration.AndroidCamera;
 
+import android.app.Activity;
 import android.content.BroadcastReceiver;
 import android.content.ContentResolver;
 import android.content.Context;
@@ -77,7 +80,10 @@ import android.content.IntentFilter;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
 import android.content.res.Resources;
+import android.hardware.Sensor;
 import android.hardware.SensorEvent;
+import android.hardware.SensorEventListener;
+import android.hardware.SensorManager;
 import android.media.AudioManager;
 import android.media.MediaPlayer;
 import android.net.ConnectivityManager;
@@ -89,6 +95,10 @@ import android.os.PowerManager.WakeLock;
 import android.preference.PreferenceManager;
 import android.provider.Settings;
 import android.provider.Settings.SettingNotFoundException;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.Window;
+import android.view.WindowManager;
 
 /**
  * 
@@ -947,6 +957,79 @@ public final class LinphoneManager implements LinphoneCoreListener {
 
 		return distanceInCm < threshold;
 	}
+
+
+	private static boolean sLastProximitySensorValueNearby;
+	private static Set<Activity> sProximityDependentActivities = new HashSet<Activity>();
+	private static SensorEventListener sProximitySensorListener = new SensorEventListener() {
+		@Override
+		public void onSensorChanged(SensorEvent event) {
+			if (event.timestamp == 0) return; //just ignoring for nexus 1
+			sLastProximitySensorValueNearby = isProximitySensorNearby(event);
+			proximityNearbyChanged();
+		}
+		@Override
+		public void onAccuracyChanged(Sensor sensor, int accuracy) {}
+	};
+
+
+	private static void hideActivityViewAsIfProximitySensorNearby(Activity activity) {
+		final Window window = activity.getWindow();
+		View view = ((ViewGroup) window.getDecorView().findViewById(android.R.id.content)).getChildAt(0);
+		WindowManager.LayoutParams lAttrs = activity.getWindow().getAttributes();
+		lAttrs.flags |= WindowManager.LayoutParams.FLAG_FULLSCREEN;
+		view.setVisibility(View.INVISIBLE);
+		window.setAttributes(lAttrs);
+	}
+
+	private static void proximityNearbyChanged() {
+		boolean nearby = sLastProximitySensorValueNearby;
+		for (Activity activity : sProximityDependentActivities) {
+			final Window window = activity.getWindow();
+			WindowManager.LayoutParams lAttrs = activity.getWindow().getAttributes();
+			View view = ((ViewGroup) window.getDecorView().findViewById(android.R.id.content)).getChildAt(0);
+			if (nearby) {
+				lAttrs.flags |= WindowManager.LayoutParams.FLAG_FULLSCREEN;
+				view.setVisibility(View.INVISIBLE);
+			} else  {
+				lAttrs.flags &= (~WindowManager.LayoutParams.FLAG_FULLSCREEN); 
+				view.setVisibility(View.VISIBLE);
+			}
+			window.setAttributes(lAttrs);
+		}
+	}
+
+	public static synchronized void startProximitySensorForActivity(Activity activity) {
+		if (sProximityDependentActivities.contains(activity)) {
+			Log.i("proximity sensor already active for " + activity.getLocalClassName());
+			return;
+		}
+		
+		if (sProximityDependentActivities.isEmpty()) {
+			SensorManager sm = (SensorManager) activity.getSystemService(Context.SENSOR_SERVICE);
+			Sensor s = sm.getDefaultSensor(Sensor.TYPE_PROXIMITY);
+			if (s != null) {
+				sm.registerListener(sProximitySensorListener,s,SensorManager.SENSOR_DELAY_UI);
+				Log.i("Proximity sensor detected, registering");
+			}
+		} else if (sLastProximitySensorValueNearby){
+			hideActivityViewAsIfProximitySensorNearby(activity);
+		}
+
+		sProximityDependentActivities.add(activity);
+	}
+
+	public static synchronized void stopProximitySensorForActivity(Activity activity) {
+		sProximityDependentActivities.remove(activity);
+		if (sProximityDependentActivities.isEmpty()) {
+			SensorManager sm = (SensorManager) activity.getSystemService(Context.SENSOR_SERVICE);
+			sm.unregisterListener(sProximitySensorListener);
+			sLastProximitySensorValueNearby = false;
+			proximityNearbyChanged();
+		}
+	}
+
+
 	public static synchronized LinphoneCore getLcIfManagerNotDestroyedOrNull() {
 		if (sExited) {
 			// Can occur if the UI thread play a posted event but in the meantime the LinphoneManager was destroyed
diff --git a/src/org/linphone/UriPickerActivity.java b/src/org/linphone/UriPickerActivity.java
index 1edda8289..dad28f6b3 100644
--- a/src/org/linphone/UriPickerActivity.java
+++ b/src/org/linphone/UriPickerActivity.java
@@ -154,6 +154,17 @@ public class UriPickerActivity extends TabActivity implements ContactPicked {
 		dialer.setContactAddress(number, name, photo);
 		gotToDialer();
 	}
+	
+	@Override
+	protected void onPause() {
+		LinphoneManager.stopProximitySensorForActivity(this);
+		super.onPause();
+	}
 
+	@Override
+	protected void onResume() {
+		LinphoneManager.startProximitySensorForActivity(this);
+		super.onResume();
+	}
 
 }
diff --git a/src/org/linphone/VideoCallActivity.java b/src/org/linphone/VideoCallActivity.java
index 102fce001..9e10b615f 100755
--- a/src/org/linphone/VideoCallActivity.java
+++ b/src/org/linphone/VideoCallActivity.java
@@ -23,13 +23,10 @@ package org.linphone;
 import org.linphone.core.LinphoneCall;
 import org.linphone.core.Log;
 import org.linphone.mediastream.video.AndroidVideoWindowImpl;
-import org.linphone.mediastream.video.capture.AndroidVideoApi5JniWrapper;
 import org.linphone.mediastream.video.capture.hwconf.AndroidCameraConfiguration;
 
 import android.app.Activity;
 import android.content.Context;
-import android.hardware.Camera;
-import android.hardware.Camera.CameraInfo;
 import android.opengl.GLSurfaceView;
 import android.os.Bundle;
 import android.os.Handler;
@@ -42,7 +39,6 @@ import android.view.MenuItem;
 import android.view.SurfaceHolder;
 import android.view.SurfaceView;
 import android.view.View;
-import android.view.View.OnClickListener;
 import android.widget.ImageView;
 
 /**

From 7f2efdb45186294b6f5d8f50ad5586d7f548d4af Mon Sep 17 00:00:00 2001
From: Guillaume Beraudo <guillaume.beraudo@belledonne-communications.com>
Date: Mon, 10 Oct 2011 15:03:37 +0200
Subject: [PATCH 37/62] Fix dialer hang button sometimes doesn't hang calls.

---
 src/org/linphone/DialerActivity.java | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/org/linphone/DialerActivity.java b/src/org/linphone/DialerActivity.java
index 3c8dd2a9c..bbeaff1e4 100644
--- a/src/org/linphone/DialerActivity.java
+++ b/src/org/linphone/DialerActivity.java
@@ -136,18 +136,19 @@ public class DialerActivity extends Activity implements LinphoneGuiListener, Lin
 		mInCallAddressLayout = findViewById(R.id.IncallAddressLayout);
 		mInCallAddressLayout.setVisibility(View.GONE);
 
-		if (useConferenceActivity) {
-			mHangup = findViewById(R.id.HangUp);
-			((HangCallButton)mHangup).setTerminateAllCalls(true);
-		} else if (useIncallActivity) {
-			mHangup = findViewById(R.id.HangUp);
+		HangCallButton hang = (HangCallButton) findViewById(R.id.HangUp);
+		HangCallButton decline = (HangCallButton) findViewById(R.id.Decline);
+		hang.setTerminateAllCalls(true);
+		decline.setTerminateAllCalls(true);
+
+		if (useConferenceActivity || useIncallActivity) {
+			mHangup = hang;
 		} else {
 			mMute = (MuteMicButton) findViewById(R.id.mic_mute_button);
 			mSpeaker = (SpeakerButton) findViewById(R.id.speaker_button);
-			mHangup = findViewById(R.id.Decline); 
+			mHangup = decline;
 		}
 
-
 		mStatus =  (TextView) findViewById(R.id.status_label);
 
 		AddressAware numpad = (AddressAware) findViewById(R.id.Dialer);

From f795954e9a60575e624501ca49b691f95400b804 Mon Sep 17 00:00:00 2001
From: Guillaume Beraudo <guillaume.beraudo@belledonne-communications.com>
Date: Tue, 11 Oct 2011 11:38:53 +0200
Subject: [PATCH 38/62] Use Android SlidingTab for incoming call activity.

---
 .../jog_tab_bar_left_end_confirm_green.9.png  | Bin 0 -> 5892 bytes
 .../jog_tab_bar_left_end_normal.9.png         | Bin 0 -> 3952 bytes
 .../jog_tab_bar_left_end_pressed.9.png        | Bin 0 -> 5656 bytes
 .../jog_tab_bar_right_end_confirm_red.9.png   | Bin 0 -> 6029 bytes
 .../jog_tab_bar_right_end_normal.9.png        | Bin 0 -> 3332 bytes
 .../jog_tab_bar_right_end_pressed.9.png       | Bin 0 -> 5754 bytes
 .../jog_tab_left_confirm_green.png            | Bin 0 -> 5039 bytes
 res/drawable-hdpi/jog_tab_left_normal.png     | Bin 0 -> 4523 bytes
 res/drawable-hdpi/jog_tab_left_pressed.png    | Bin 0 -> 4437 bytes
 .../jog_tab_right_confirm_red.png             | Bin 0 -> 4684 bytes
 res/drawable-hdpi/jog_tab_right_normal.png    | Bin 0 -> 4241 bytes
 res/drawable-hdpi/jog_tab_right_pressed.png   | Bin 0 -> 4148 bytes
 res/drawable-hdpi/jog_tab_target_green.png    | Bin 0 -> 1119 bytes
 res/drawable-hdpi/jog_tab_target_red.png      | Bin 0 -> 1123 bytes
 res/drawable/jog_tab_bar_left_answer.xml      |  28 +
 res/drawable/jog_tab_bar_right_decline.xml    |  28 +
 res/drawable/jog_tab_left_answer.xml          |  28 +
 res/drawable/jog_tab_right_decline.xml        |  28 +
 res/layout/incoming.xml                       |  28 +-
 res/values/slidingtab_style.xml               |  31 +
 src/org/linphone/IncomingCallActivity.java    |  74 +-
 src/org/linphone/ui/SlidingTab.java           | 844 ++++++++++++++++++
 22 files changed, 1046 insertions(+), 43 deletions(-)
 create mode 100644 res/drawable-hdpi/jog_tab_bar_left_end_confirm_green.9.png
 create mode 100644 res/drawable-hdpi/jog_tab_bar_left_end_normal.9.png
 create mode 100644 res/drawable-hdpi/jog_tab_bar_left_end_pressed.9.png
 create mode 100644 res/drawable-hdpi/jog_tab_bar_right_end_confirm_red.9.png
 create mode 100644 res/drawable-hdpi/jog_tab_bar_right_end_normal.9.png
 create mode 100644 res/drawable-hdpi/jog_tab_bar_right_end_pressed.9.png
 create mode 100644 res/drawable-hdpi/jog_tab_left_confirm_green.png
 create mode 100644 res/drawable-hdpi/jog_tab_left_normal.png
 create mode 100644 res/drawable-hdpi/jog_tab_left_pressed.png
 create mode 100644 res/drawable-hdpi/jog_tab_right_confirm_red.png
 create mode 100644 res/drawable-hdpi/jog_tab_right_normal.png
 create mode 100644 res/drawable-hdpi/jog_tab_right_pressed.png
 create mode 100644 res/drawable-hdpi/jog_tab_target_green.png
 create mode 100644 res/drawable-hdpi/jog_tab_target_red.png
 create mode 100644 res/drawable/jog_tab_bar_left_answer.xml
 create mode 100644 res/drawable/jog_tab_bar_right_decline.xml
 create mode 100644 res/drawable/jog_tab_left_answer.xml
 create mode 100644 res/drawable/jog_tab_right_decline.xml
 create mode 100644 res/values/slidingtab_style.xml
 create mode 100644 src/org/linphone/ui/SlidingTab.java

diff --git a/res/drawable-hdpi/jog_tab_bar_left_end_confirm_green.9.png b/res/drawable-hdpi/jog_tab_bar_left_end_confirm_green.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..7c4f40ea9dd2a772f7e01952d3d696c19a61a325
GIT binary patch
literal 5892
zcmV+f7yIamP)<h;3K|Lk000e1NJLTq003410052%1^@s6t2_U-00009a7bBm000XU
z000XU0RWnu7ytkYPiaF#P*7-ZbZ>KLZ*U+<Lqi~Na&Km7Y-Iodc-oy)XH-+^7Crag
z^g>IBfRsybQWXdwQbLP>6p<z>Aqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uh<iVD~V
z<RPMtgQJLw%KPDaqifc@_vX$1wbwr9tn;0-&j-K=43<bUQ8j=JsX`tR;Dg7+#^K~H
zK!FM*Z~zbpvt%K2{UZSY_<lS*D<Z%Lz5oGu(+dayz)hRLFdT>f59&ghTmgWD0l;*T
zI7<kC6aYYajzXpYKt=(8otP$50H6c_V9R4-;{Z@C0AMG7=F<Rxo%or10RUT+Ar%3j
zkpLhQWr#!oXgdI`&sK^>09Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p
z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-<?i
z0%4j!F2Z@488U%158(66005wo6%pWr^Zj_v4zAA5HjcIqUoGmt2LB>rV&neh&#Q1i
z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_<lS*MWK+n+1cgf
z<k(8YLR(?VSAG6x!e78w{cQPuJpA|d;J)G{fihizM+Erb!p!tcr5w+a34~(Y=8s4G
zw+sLL9n&JjNn*KJDiq^U5^;`1nvC-@r6P$!k}1U{(*I=Q-z@tBKHoI}uxdU5dyy@u
zU1J0GOD7Ombim^G008p4Z^6_k2m^p<gW=D2|L;HjN1!DDfM!XOaR2~bL?kX$%CkSm
z2mk;?pn)o|K^yeJ7%adB9Ki+L!3+FgHiSYX#KJ-lLJDMn9CBbOtb#%)hRv`YDqt_v
zKpix|QD}yfa1JiQRk#j4a1Z)n2%f<xynzV>LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW
zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_Ifq<Ex{*7`05XF7hP+2Hl!3BQJ=6@fL%FCo
z8iYoo3(#bAF`ADSpqtQgv>H8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X
zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ<AYmRsNLWl*PS{AOARHt#5!wki2?K;t
z!Y3k=s7tgax)J%r7-BLphge7~Bi0g+6E6^Zh(p9TBoc{3GAFr^0!gu?RMHaCM$&Fl
zBk3%un>0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4
z<uv66WtcKSRim0x-Ke2d5jBrmLam{;Qm;{ms1r1GnmNsb7D-E`t)i9F8fX`2_i3-_
zbh;7Ul^#x)&{xvS=|||7=mYe33=M`AgU5(xC>fg=2N-7=cNnjjOr{yriy6mMFgG#l
znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U
zt5vF<Q0r40Q)j6=sE4X&sBct1q<&fbi3VB2Ov6t@q*0);U*o*SAPZv|vv@2aYYnT0
zb%8a+Cb7-ge0D0knEf5Qi#@8Tp*ce{N;6lpQuCB%KL_KOarm5cP6_8Ir<e17iry6O
zDdH&`rZh~sF=bq9s+O0QSgS~@QL9Jmy*94xr=6y~MY~!1fet~(N+(<=M`w@D1)b+p
z*;C!83a1uLJv#NSE~;y#8=<>IcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya?
z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y
zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB
zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt
z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a<fJbF^|4I#xQ~n$Dc=
zKYhjYmgz5NSkDm8*fZm{6U!;YX`NG>(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C
z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB
zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe
zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0
z?2xS?_ve_-k<Mujg;0Lz*3buG=3$G&ehepthlN*$KaOySSQ^nWmo<0M+(UEUMEXRQ
zMBbZcF;6+KElM>iKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$
z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4
z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu
zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu
z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E
ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw
zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX
z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i&
z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01
z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R
z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw
zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD
zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3|
zawq-H%e&ckC+@AhPrP6BK<z=<L*0kfKU@CX*zeqbYQT4(^U>T#_XdT7&;F71j}Joy
zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z
zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot<a{81DF0~rvGr5Xr~8u`lav1h
z1DNytV>2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F}
z000axNkl<Zc-ripdu&_P9ml`-`r6me*iM?})y58Kp6eqirBK>+kV5Hrl#NGQ(4_HL
zM_ZMRKQ`^JNkeGTCNzmZ%J$blNU*Vj&>lz=8WB*~CMMQ)9Yv)~Z6FJzO}nOz<Ji9U
zoU=b-o12q+9sByGiQ{vsqkHYRZvDyke1E^+@jd5Cj4_A?NRq@DW0D}@aC2H<(tNzB
zP`?nqXced0D*cSoJhLFm5(X%hcytnOMT3<rAoAyh`g{RSDHRUWtjiWh{=68#cH6j8
z!7z>B3U$fi@mzq*YDxvebQxf|43GKqxqzF&EgP`1NP*^#W{PuhU9mXlI}h5*F3N`b
z&cB|w_XfW{vd2-Hk8XWgvQQ@vQ!&8Hox2U^iplF-09;$|YF`lwtAVcd_3ey73WnX$
zK*$pX00u~P4Zaw2s03|rU%Pri6*~t|9%c@rn>#l?r!>WCg6p@gXzl8+UlpnMHV1;9
zXfWb#V2pxg|9~;ZKn<llLt2|8PJON<xopo0%KgQD=WD;S0?H3@w@LS8d;YmS2mAYC
z-Qo87mSB4@>~5fpfH9hdry;FpC}R`=!}Nchfq}9wKTlS-P9?E2x%wW<LFI?LVgk_(
zKs5mMG{tIac0ADC*VY?Zy?jNWdm1ERl<CM2jWR~S*fcz+p%v38rFIot`rp}m(=3(d
zfbv5<2T(NtRRO5G5BB%>Zd|@`d5f=`G6Kp7OKX$)VNDrj9K;1F*%`A5wp0P^z1dWy
zyh4pIRRCT9YE!Hxy!&9^K)gG=!R<wuGQu)il2S&&Ko&%ib1Rn3uN81Wc^~D0dJSD&
zyQ#VP?uUDKG+z^3PngaK%`lA+O4;Is=?K_jtl+x?bE?#+PG1h{+D*+ZJ0I@d(bN`L
zPpHPyT9Qr=`&q+$@q#6EezJncwjJgZd}G?gE7S+T*VI~5yX)Y(fsVfDHbQll)+Q-q
zw4#8{s}*FS@<X3jsTY7h2lf5~>o(kQ+sd78FAHn>RK+QD-mPHYEv8U;AN6Iszp=HZ
z_OT~#_*Pw$+CylDWi*{pMk*Gl1L@Z655E7_S9qw#^vP>bsULv<zWr;j+j2+iZYJw$
zMo+TophOoeMRKwcyB<3SRAbaPs?-l40Kor)XKvcPvMYEap&3eu#wvN(JE~YCgZ<lI
zF&qB5BtJLo0{{Yzt)aRnp5F33HHZdHpQ427OA2WDR**d&*ls!ejR7hEAh_lBwvL^T
z_B^7fB&-pQQA(C1)Uwho160fbH3%TE`Rnn{d-nD2XOgDsM9T)KrQ0ZFwgZI`s>?9^
zRnAXCH|~gc-n+kNACq*CPBXaxwY1yC*qU;Jmsv{XHF#?9#vSp_d-nD0qtHD%sS>CF
zKpAA4K&_Jhe4xrfttzGFxt8v+l7(7lSiqLs+q%B7xBCG5QmIvSl^C;Gc@?q%e^abx
z*=-N5dXPe^uHiqUfTAT?f!PH0EVVxNlk4}YLDo=h!=JBA6`K}d2GxJysZBfm5h<?g
z8AhuVYN=ph60nSO0KVJybggMyU9(Li>1^^}y^W!`tYFSUpea_fZ0pYW13Jl6J=CmZ
zOR@r9tvMU;-FIN^9kQy2b)r*N#TJljPd@${Q;Gm;m9u&Q__puvTD_vfzgg2$wA#|D
zLQO8=b-cIw0C>0F9h<fQq0|{oDZ*Q2lVU&x;C<*v*KL>GB&-v{#LAoE!CDmq9su6P
z)|%Rm{>UvlNrO@%NS0^?vQ>(;^O2qbNJJG`Kxv9C^!=6E*jf{9?F?-pB+Vc!pk&2b
zrC91+4|NYnE~<)vRhnY0)S6dpOM7qwq5AZ-rlOS`y!h*^JOI=^kFVRTcxXf?Is?RN
z=~Au0tSImR@U-<tHd01}T5VbZpS!vNczUjFXbePLZ5q+3h*_m6Rw|^}&9}!kQKmC7
zA5flR`IRZ|=C;5FqHChaasX`J3cA-XZ&Xx-HJvcwuccXm*>a$~Vz0fqWgTTA#j>kd
z$;t|v<H6OGibAWLbW1kL3Y1_}X`8+(P&CIBJ8<u+Zb}Il6%*OzdhCo9g7L0Mhe!pS
zRjdnuD^%-lnZDv$z%3Q5*^2A@szHB9X{J;cfve2QYsN+k4J$)Iw<?7NRr^+8x=%pw
zhUF_6qhdEX2ZGm(A|YDuTPBz~6TD_@7ZQqkYK3C$E0*66C2t45pb{1JmUF=?57!rP
z)e5yb6TD`?%}%<Aipznyf*FuiuM!nbP+oyxs#-;rBD$yz%1*atsdjqP8iCcRxq>et
zGX|ko=R8(4hZQ@k3BlS|tiU!;V2weG8M<f=Spg4|Wt~7!E+cp`6U8zBES)0b0+VxD
zK^|;oid>RJMO(HN@SRGK0daGivK2c6Dgc_A)GtBYJEbg-HTo>g^<+Z3Brug<AmpIt
z;Z9u2Tm*dL8-y~fV3rL4AmbO(7bM{Yj)0{`upb{C8y552&IK<DfB>N9M-qulnu=Vu
z%-}`2t^?4MSG3PXF6*pf2>_B9*GGiSI^(g#(DmU@uACP40d!WeIspCMKMkFdAPcf(
z&K1na3IJ#T^ojAz8G*}T#RAaAhEpF(lK3Xai9B`&*yHbw9+xFy2jy4+AHXyK+J8=5
z9L=Pe$Y&h_n^!CV?c8U{e~5h6zQ>xu)c|BZc=PkWOS16UausXL3N!$jPflDMO^oYj
z1vYzNEfotOGxAB|eUTm52Mdz`mI09d<8vSXRZp|a0-Zf8Fs5F*(GCElM@0}TOR>Bi
zWB{ZAqz4ZV4KgaH1U`EnYo^)^fb`hN<fV}_iFbu+?I{)}Ragc<3P5V`@X#Qo(v(1G
z4=m%-u1pT@*vRDnhCaITrckXtkA+E2o6h#sYri`6hMs{ab8RS=PrZzGFa;p>!Qi>y
zh`iRG6_^zZ=^WhmUjOXhqeD~g2}`i2SgX`)3c%DGFP(W^%ZQn;Qo-^QGrVe(V<VFn
z{yBJFSb`13TB$Z=u!Ix;Jw5psVF>_ZOe)0+tW-M%APFG(@-rv@FnO7X*)NoS?U3<?
zlg6#3b9b8y)wcv1c0JMceXn0`s#d5TJ<{cJ;1@AtxoC1iBYFm3#Ja=%k_>k>f>oIB
zkjr6}O8}(NPZJZVNqRQkQ=M?#@Y@1g6#UUo6BDTf9g6pa`>GADTe1&UvIuT7+URGA
ziBy7~tv0wGDR9VE;`!7IcQT7f8e^6)2_SL&-O*ETy*m6$N~&ijOqM14i<C{^&MF)L
zBmg9i9~u4l?N^7N)vDyW1X-5LTm7Ad%jU>$696WT9T`3K+h3geSt?1t5Q?=2mvD0l
zdAMUEljooP;nAO-TjG;8Wh>SKE-9p30241hee$Ja?~FZ9bu3BWm0gl^8$npuLdF8_
zmBGV9e|z!gA3b^bf_8GLsaKX|*h;qszS(K{{9C_2Z8py^YyB7imYmSiN8dho%op^W
zuWRzPxfIE}6u^dj(L;`c<=~pFDCZZC5CHV-$??%MA6_|H*WhR2I<>vh!PfZa0jvS8
z#1#$&;U*`v)XDcRoIW=^b*#Q65D0|a&6Nr^9ITxmupC?zP%h#7rSqx8@gwI?oEx4x
zTB(2|p}Ir1qQ+A%+*#7=fBfy&%{HVo-fks-_a#I30#NIl{gIpRk8Nvg^<C%o%8^O{
z8*l39x+-8z;PUqnH{N>1!$HoUZ`&1LAMdTXK3cE#F6K?vu36D_^}x=dUNZ&fAiE8K
zJperQ&HnJlTbueD+X8DABji=BJy##Bg?deI6Tm@sbBfMCw{2IvzcCi*2ru)r`+}|o
z|K_4I{*{FRTLfU41FUeM&7dm)l=^0WsH3kowxT1nDin3M1VT#l)%NC|Yt}6+*dhU&
zLFR9XrEuM4IJyA1`o7xG>I=F9t(~EE1}1p}O4JunY5{;zCWUI<ai>1dnvM-!i>;QF
zxT9PEvdaXZV)FA`mkmeR@ZJ)4Zv6LcwU-8;`14{d(k1Sk2f#z(;aP#?p~{%OXD%Fo
z`@XVB!7_`-)Bu3M{B9$KAQl4Zh+1=Pv4SlXvX!c(0z=*kXw`r%1~MP~U;(gLpi;Gg
zwSvsDFj#>=IM>lJwN^UVQq_z(0E(;mL=#Q4`Ao#CrWLbKW4XIFN!7R+q$EkK2>4}@
a{r><drlk`Mp3&d{0000<MNUMnLSTX~_9c=4

literal 0
HcmV?d00001

diff --git a/res/drawable-hdpi/jog_tab_bar_left_end_normal.9.png b/res/drawable-hdpi/jog_tab_bar_left_end_normal.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..b9ec2374af62cb16e4446360d54818d7dba5eae9
GIT binary patch
literal 3952
zcmbVPc|6qn*B?7$?+z&$(<m{PnZeAUp<#x|l4VR|XUy1VF*6u)L$*?pN9xM8wv9n3
zdnpoKm96Zuq;6f2u4L(wp3$xQ{QkJF-yhHC_4<B4+d1!Z&ikCtcRB6id{`d18wdaZ
z<n8SUZo-}<yv|BX3h!^0{q707U0fS7*PR*6jSXbe09I5cg$A*w2ZqqxXo1wYsBRh-
z01yifBa*pfCr9%jCfzV_TgH$_X9=|d0PG<iD=;X6#)VL5Az=&)=!ZM^p^z}D1@suo
z3E{-T(?Y}S;@LF!cxPfzd_<5L6?(`Lg5{YD0q8VtAcRMcWN^%R7SM0F=ECvzG8_u|
zCc=%dfd1_i*~tZhXR>J!lp(?(2!TdG&`3k1u?Yr)(T5lzkO(-!2#z!|Kw`{|jm!}U
z$oB>nT4Pg#&D{vL-)#wJ7SK>Gmt_uz$HvAQ#u^(k*&%SGnVH!(hLMqhP{M!{$KVF?
z3>X}(9|!~*Cx{)!;)XF9kZr_33NxB(0Tp`scL;QrlhZ%I49<6=gp|Q~fh;)E5CNyt
zx8wRI&EdMy{?CnnmF5uRSTwjBjl+y)2MO~Lto1`#$lZT8v@Iy~#{4KdOqi6wNCGn`
znoeVI?Fkl8;f^6SjB0LcgRw;-F(wF%5dv+BM4I98W_SVykG8eNm>L-&e_;HZF2UN^
z%GAip3U7r*BasAKQvwQ)N7-NqcpDQNv@zy~u04ap4P*q-e%K8Y+WoF;_Fr|)@oZWk
zm&qnFnUOy#z$KK)WpYB9EC}8m1#t=t3S(@~x6|`?v;-PEEQUt4Wi#oJZ~U5v{fm7B
z$`tXRaa)_3AP8ubi5bcofiXr|LBH!#|393;h0egYi{n3v<;Rk+0=I|%l)iBC&*7ml
zgeQhAJQ}@cOk4l}*%Et#6_Gc-Q0Tzi<EiqfLQtW(*f7C33XaJbz35+>-=)|U^MI<{
znVSRMJKA$rNga(vC&;MkuLFKcC8ze(1g52u&*JRla*Rb&&f@o+&&z;5sx4d+yE8r6
zY1Y}=^S;3Q3%})k)1Ae<EI~`|=;Zy)4_|-X;KQ8U&!HXOC_aB*9O?<IaOAh#gz$&M
z1S@l~gA-57B4d!a*3K)AO&ao~*reZzN6y5E^yX_QxP#I=at<*iYbIg>Vi1n1KCS&4
zei+e(@_Y?B<F+;+qWbf)ZJQ0tLJZxf;}Q?jHEc_pWA#cYj&~bk@xK24v5KqX^%2iP
zZ&p_Rq44f?;AJ^%Jeb<+)INRt)#E%pe_%#OZE0z#%$_h?XpZ<@XCh2xW6k!;fUD<p
zNNns{ER$F(pY#!-`w$Y_doM&mPVQ3{PAn-G5HV`vByK7Wcpr7}B%$ULO5xDbN_V%t
z&2U2d*49=*?MZXoXG1WEaEh?fT5+tpS6)HE`P1sEbE<Xe8R_iQv`3L>Z{15zb{Fof
z{iR#Ej9k9Fzmu}`sh#ced65Bx%p#ux<db2q=D6`&FPb^bN0eF+?zUZMzGGLqorqhS
z8;@9C?L@a1_lD)YNTIK!yttoOd`ws3acndY@f1+scj@BAH@V%fq1+|77B*D|@`UF+
zWS=w)z`h?lxQV?{Mph8yT6_MYri?vlz9I4l8=AwD@>|n#9IsafdmNC6Q@xI}&>c=W
zQl9Y<r{$Om_rLe+uLT8nCPzjv*_xn)Cntk`uY7<-)j07lc!VgX0derXE_MXzLDGQ}
zE<~7<U5N6Va<Yh6p6XQO*h4)~=_>A$rjM|tr`DZ)M=0S@hsJdEG>Sm;b(^?bmeVV7
zdC-2HG$6PIfkv+yeCqcxJSLF|qY0%Pz|U0X0eNc!;2i@(YTMN@j07oLE8SF?<jJYo
z<QT79FGkK{pEd2t4e2Xx2TLa4S=rf%08OZ)#}SLV=Q}ai_QMrm1uLFH3u<8I^t~@u
zSa2eyxNib>ZStNs>CCkx6&+L?=yTnKR=*neOCw{lWku`H$Fh^x-O2;zxru12y@OM8
zb93eS`S~A2A8uKf2IPp-qF)tB9_@B;xsh423LPykFAw88B?53AN-@6UbXeXsG8i^r
zURk^f9UL1Q`>-J)ILme*y4k25t+MWXn(Z<mYTkS{95Wi<nTT>dUGf(#TTPpKTSFCa
zI(+wzA;n#MzT5NyXt|7hK(=jQ(7T-YZsPpP&o_vq+H?n5gt%%zg-SYqI^~tkW&UQ9
zO`S^3$`L&vDt`G*4^vV!*%iGJVHwE)J<-;WQ7Ac3=$shMVzGAJu`HZin@<nkoVtFv
z-j-kO?C6+~8k8tH{BhZEiBy$zOs_t<C@n3G3Ha@V`R{Mns@B%OoYPJ+AF3P_eYV8g
zoToY+@$KtBsS>I%6<+P0ERit!J{NYYD#^ETR!XdaQtf|#%X0I)2u)<MGD%ZzG&60n
z*feo#^SHE!CysvS_!<LWlkR>Rb?DH2Ihec_`TlUl3Lye*=T){+f#632j_4l`OB<{N
zUc=>7T_nG3Zf>R}?b=(QbHS@XeEuqlRO^3b-s7=%XHR6=L&2DOO<mn5!#%Y-`1~U!
z(Rxbqz=cdmj-5WNzQw)Lknc;c>87%E)a0^WK0{63sa8Tuk*aTuE-fupP!TSZGZkJD
z-DlFgoczw$O)YI)DABL+&{G40!Ox<9#_g{huEKH6Ts&&Ew6u(=7p_T)8-gkhdWwv;
zO$<tc(6OWdX@RIQ2zXAHnO8YVghi*tSBTE{1V!9bO0{a=H`XC&JK|QU@sed~Z|jvA
zekN1JH_Ep)Txq;!ch_T&%7KxQoyKxk{6(S_Nxb4Ds!?3Nwt>Wm_ea65eS|9m9Bv*i
zc_ml^)hL_%7pgR=Me514V&_bomjHS`_pX4oG^`oUz!g0ry);^LaRtvu-7Jx0LzL89
zaIJBbF7<#0|G<w7iR$u;&5tt6_Up!tImyf2)gx8BY7}%!R;1rvtimZr{6uc3@OI>D
z>&7i1R03qc5i+2N!?k4WLp{o%Px7xh$5bNAiQ^;DlWs?^{245fK>YL-W%Kw7C8C5<
zLixhAPdJFZxH1NmMJq`YBfN%Q=rufe(DQcLUoE}V&i*4=Fv><3Op4V!4&9$rRTB^!
z6I1k)x=X<ReQ<RcIJ;D2P;5UrHozvlQzsAvOxyX#ZQxC8=eS5fBM4>&_6{!N@_6e^
zo#yqBTK*fW+6EQuiOqH8tx|#9-5!-eqJ)x7&pk!T9P+P9fx<qR>PzdWKa=<**Jbjf
z;iSo_DL;I%N5G`FNO4;~F!T8F;}hh*Ssll*<k%XI&K(EW^<bp(;lf9mGtkio!^6Xw
zx5PeV(kevN^~bGh$qClK!CDMXMiceB1_lP+3Oy@4SaTVYymxf7tE<bx6kHbWu_Iy<
zIQp#O;kd|y9;#8ItKYm|?Olyg7bF^k`3i7ZK2pDkC0+GWU+nJgwtN^urCGT~y4GF}
z0Hp_T)c9V23gY~Z%FaAr3E)o9h6GW%*lh^bR25gL%@14N$5sSm*Fhz-x6XNWRng;1
z2K@UUjvOGuDUzM{G9SH?eeH($y}3U)B;<ohkVIL#brFxgI(9o`ek^hoEFgJ`x<Xi?
z4YCLG{5<9CsP`p)2g4jfE#ppW2lIx4Avy0`c}ug$sQX9OJgoIHquuCPwW*1FG&R2#
zJ=I#@&8Q&FT=l9;k&`6K+!wx}j?V2n=l_z@NB5{*xKJj&*e#@>Ph`>IUE_(=34zL>
zy2)!DpV`J@2rJdWkoGK(;(a^ymR&tybzu2z-v_0pmg$)mkqLf-P16CjiHQm6wUD;@
z8B7zS9UUYiy*66SijunfQY0Mj0AXSJRdsw0U7+~2h0k$YUbcy}8$JG_mIThRvOm_b
zB7QMB0>x)4FDAM)_n!dbqFx<VVPHhjPVURthMjE&9FB}fQ@&$xNObhdfzJtBeS9DB
z7w1^QhkKjBh`XWW*?!Bom3Kq%sL8YS=?oEl`A7|K9n&_8_>Zr<TQd|jx0;BsFSjQK
z^;Co#ETSQ~<4JveeYR_>N$uXzBiATgqX2Pr)<!nmr)g$=tG8Fd|9{MUu@wJ&4vSUu
zGnZSp`<!jPi;jtXb<$PVLAnQp&Hk9ht&#Kbt!SOL@@?v*AR8MS*Q$LC*D!z=QeWpU
z@!GsH7KV$9iWrJyg`1?q%`{8E!qVd6;%<pOa*}YFcYa^=@y^%WVxPuriJG4x`};G+
z8-nrD1YTm|A;l%xq>cHUoSe1z_;^<Pjt^cLm;UlTS>9sIkwBfYiYTBI5SccdCh<&3
zGC@^;R#^_Q1yacHf56w4)7*rTlzF+RGOxnX^b@LsSYzYoex2xYzcU%#<(DiyO+I~^
zd)_y*ZpLp)<nefxJ5FESd(V22a%?Zlpv7zR`h{~I$#LUf3#8R%-ida8RL47tVtxZO
z6h9NEc?EMg9L3(Rr#_s^%IXzcu;=S&;|4m!5th5pz(&f3Bwh{C?`X&-WIdOfFYzn9
zEuP|fvpni(*lceKp<8d=Qu{6eihL&g$dEXn8=!9AfsnL|ZeLX`oT|<NT)G}wQ;894
zuy0!+#IFSI+_!$1;_))&m+UBK(cZ7Un|A=~o6_8YP%OA{o|<HF3ZrpdAz3jgccrzh
z=tatY1Qm5}YDk70-+>a$mXS7yIRLTChpJ`liZXaF#>c&ew(i?xP8xMGZ?GpRwWIm1
zxL5U;J&u3rS`evP4aAFNa60z#N?K;tTIg#%#=v1V&o>Zo0k!np_MKIw6fx7QBF{=n
zuC*X};c9rR^QBnPcj`4gxHpZL!xaDp5`qo+$SbKKGBYN}FI*pXmYNV;u9pN1WrYn9
l-Kz@Inu;$EG0<OC0swDqzNkYRD!=^$+uJx3ZdwPN{9jvH&a(gj

literal 0
HcmV?d00001

diff --git a/res/drawable-hdpi/jog_tab_bar_left_end_pressed.9.png b/res/drawable-hdpi/jog_tab_bar_left_end_pressed.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..2800cabeb1412b148a76a847fe333bd63223439d
GIT binary patch
literal 5656
zcmV+z7U$`SP)<h;3K|Lk000e1NJLTq003410052%1^@s6t2_U-00009a7bBm000XU
z000XU0RWnu7ytkYPiaF#P*7-ZbZ>KLZ*U+<Lqi~Na&Km7Y-Iodc-oy)XH-+^7Crag
z^g>IBfRsybQWXdwQbLP>6p<z>Aqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uh<iVD~V
z<RPMtgQJLw%KPDaqifc@_vX$1wbwr9tn;0-&j-K=43<bUQ8j=JsX`tR;Dg7+#^K~H
zK!FM*Z~zbpvt%K2{UZSY_<lS*D<Z%Lz5oGu(+dayz)hRLFdT>f59&ghTmgWD0l;*T
zI7<kC6aYYajzXpYKt=(8otP$50H6c_V9R4-;{Z@C0AMG7=F<Rxo%or10RUT+Ar%3j
zkpLhQWr#!oXgdI`&sK^>09Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p
z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-<?i
z0%4j!F2Z@488U%158(66005wo6%pWr^Zj_v4zAA5HjcIqUoGmt2LB>rV&neh&#Q1i
z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_<lS*MWK+n+1cgf
z<k(8YLR(?VSAG6x!e78w{cQPuJpA|d;J)G{fihizM+Erb!p!tcr5w+a34~(Y=8s4G
zw+sLL9n&JjNn*KJDiq^U5^;`1nvC-@r6P$!k}1U{(*I=Q-z@tBKHoI}uxdU5dyy@u
zU1J0GOD7Ombim^G008p4Z^6_k2m^p<gW=D2|L;HjN1!DDfM!XOaR2~bL?kX$%CkSm
z2mk;?pn)o|K^yeJ7%adB9Ki+L!3+FgHiSYX#KJ-lLJDMn9CBbOtb#%)hRv`YDqt_v
zKpix|QD}yfa1JiQRk#j4a1Z)n2%f<xynzV>LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW
zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_Ifq<Ex{*7`05XF7hP+2Hl!3BQJ=6@fL%FCo
z8iYoo3(#bAF`ADSpqtQgv>H8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X
zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ<AYmRsNLWl*PS{AOARHt#5!wki2?K;t
z!Y3k=s7tgax)J%r7-BLphge7~Bi0g+6E6^Zh(p9TBoc{3GAFr^0!gu?RMHaCM$&Fl
zBk3%un>0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4
z<uv66WtcKSRim0x-Ke2d5jBrmLam{;Qm;{ms1r1GnmNsb7D-E`t)i9F8fX`2_i3-_
zbh;7Ul^#x)&{xvS=|||7=mYe33=M`AgU5(xC>fg=2N-7=cNnjjOr{yriy6mMFgG#l
znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U
zt5vF<Q0r40Q)j6=sE4X&sBct1q<&fbi3VB2Ov6t@q*0);U*o*SAPZv|vv@2aYYnT0
zb%8a+Cb7-ge0D0knEf5Qi#@8Tp*ce{N;6lpQuCB%KL_KOarm5cP6_8Ir<e17iry6O
zDdH&`rZh~sF=bq9s+O0QSgS~@QL9Jmy*94xr=6y~MY~!1fet~(N+(<=M`w@D1)b+p
z*;C!83a1uLJv#NSE~;y#8=<>IcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya?
z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y
zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB
zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt
z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a<fJbF^|4I#xQ~n$Dc=
zKYhjYmgz5NSkDm8*fZm{6U!;YX`NG>(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C
z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB
zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe
zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0
z?2xS?_ve_-k<Mujg;0Lz*3buG=3$G&ehepthlN*$KaOySSQ^nWmo<0M+(UEUMEXRQ
zMBbZcF;6+KElM>iKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$
z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4
z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu
zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu
z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E
ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw
zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX
z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i&
z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01
z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R
z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw
zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD
zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3|
zawq-H%e&ckC+@AhPrP6BK<z=<L*0kfKU@CX*zeqbYQT4(^U>T#_XdT7&;F71j}Joy
zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z
zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot<a{81DF0~rvGr5Xr~8u`lav1h
z1DNytV>2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F}
z000X^Nkl<Zc-rip&2JmW0ma`g_k*9JDAKkp#!1XNq$R<Y97+uA%5ekKs8b)B^w1oN
zw3nWWqRFX$LxCQ84bb*lAZo8gdnsz9K<XxrgQ~Gy*)j}SGK9#WWlL*{+^^}uTxK-h
zrNrgZ7P&LPV26Y(ia)=7^JaEtS0IFd7eEjMLI@Fp`hC(qKXl;15<-Naz9%6B0#__A
z{iJ?~97Au46oT(4bn%|wVo3uGQ0VX&B;39RD|kR;+wE$v0N15Hhv`;Dk0aaO4`9FL
zk<`a9X>jeT;PHAdzysNN?FVLrf)$}&v+ccryTR=muyjCyI!8CfMVKmiwAspn_OgpW
zRQtlfzW3gHt@g(se=K;YlZ7c!@SL_xwI!FIivWmBO-;QTjYgCCe7*!gh(@DXRaLXj
z=Oz+~69JAwkG?Rlgb>Wn&$k20!gL_YOq+gB%4V~v*Is+AFg7+;N+c35tE!q+6eUjx
zL9-I7-TGT<wVFK$0|a4ye%=izdy300RcY4NdlxQTm_2mp(8+W<U2-5=mPH65ux%SV
zJ3EAeNNA|^e{{ctrB%wF?ve{c8GuRwRkGP^x?C<-4j(>zCY4H^CWOE=O=8<N>h-z<
zl!iIbLt6H<cYv~|x&u(9fT{r03l}a_jvYJp?Nlmt+O}<2mPP9Ix=n*TD6@6a3sfnq
zP#UHRAPPXuX0yZR&!2xgm&=_MMRCNkEV8q+Lu}h7wr#&KMZRdTZYp&=lm!~4s#+)%
zUaC|o@1)b|H!RB{rfI^qZQHUea!_GDFR**5lvZcVfm$dOj#Vm^cZP<B-Y`v*)a!NP
zbVU6$DKGUHsuR5F*u*L{1|T*vGLoH}n|u4nkt5&lXP~_V>lUF{l|})?9jI@<`R3UZ
zCr<oG5QI#l(Xjg&Xs^J!L1le3)~xZ7k&*1BOP78Yi^Wcxrb$fGv~AnQAY6x&dI*({
zPf<#xaRBkTxw&)2V(}-IWku=Jeo%_k1E_SbPpdQzAORr$?z`{4pUGstV;BZ8P1El8
z)4o?=-A;ce<U6N*0zhJ9WF&X_^5tKNqBu5)Dh(2>*Xd7pPzeCZ$;ru+<#PGwgpgrf
z*U6xGX)nOCIn@nn5<p^NVq$!DcJ@QlG^2)L*v^P)kc$)$RN7N%KTVF0kB`sH%zU8h
zdekrs5|))WVwZ|#BUP00)a3a1`1tJX><3Myk}xf2l6(U73jeK+YJ7bB<m~M1FHO@_
z4a2a*wnj|qg#}DZOq?v2%O4ts5jv%It5`1!h-WgH+^JKiergy-D3$8RW8EgGpHb_@
zix+<(isI3*Dz#I^wu@E{)cB=KmwqTo((y*4LBbHJg0cd(!=mQ^VrR~rnaXCf-)lk*
z{c2{ZOSMKFUo94k@9Vlg(8JVTc&wXR9UF+9J$v>C0ESJ|<WTW+qlmN*pkA3Z3LrK;
zJ$*WzPM@#W>vq_E)sJG`yfp?OS}YcS9QFjzsmIdSt=PeU3LyH{TW`Hh2+44;op)Yt
zg8>CVG?U4U96o&bqOR+NQ|%nA=oPWb<?=<-G^0EPbmp<`u3xE{r{z3{>fdACB9>Y%
zm%nS<w#o+roq_dIYfG_1LqiqIvcTh&zqrM&vr+)4=gys*1CVysQ1Q~46}Sxw6aY#t
zm#bKo#peTjC{}REt}*~6pU;oVvRvS5?Od@!JH-}@#dFTeX<qzwUNqEJ=ao*UXDrL&
zR09CpvVyU(u~9(~(mcC%?y+v$fm(_!6bjRpWr0KW@3F2{kWQy3n^NUueOiI&k_se6
zQI0!1RCwt;Zn-LUa&of7y)_t*-L*q7m&+A-#0u79BLE_*s*c%Dcc^h<9V*ss$8~Gh
zprR;8xnhI$STUVWCq+?Ab5#DV!1X=>`F#GR<~~*K16_jMHAslZ<GDd!*8aS#VAt(J
zVzJl=$JBl21=bE^SsvzU4K8lA;6@^mjAdCoY6UPrVBzu-fX6-qS(2n-j>*3jc-{|C
z6vZ@OMc94ZdPcRxx$O@xfsDKajwaYt@Jt!Ro!Kw4^Wr4{uw0HkvI6Jk4QN8%bzMsk
z1b&^XODkaEai9T!B`%630ElUtk2$8`Qb7x>uIrnTNMwj71OH%&OSPNNU*S}{j9a^)
z0<cZfe8e$z=drZU+D_GVeUoDfMzJ;xx6x>9ilWGexB+>rqgbm}t5uz$Eie9a>@FJs
zV6CsOuW?MlbzU|A3xK`7z5T?pES_b%?7VEIngC40FxJEHc)#bVSPOuq>-suJ6^zGP
zR5c$ye0YZ^gJ2bF0x)mizI}^ZL3d!mrUC#)(`Q#Wu7DK_z}VW_TI8w?CdcjqySBFW
z-$*3F$#!7{YzJllFg7+ezUFy0IIu0n0x-6>x36<M@b9s1a18+Z%F4=TJa%=jSUMFL
z0Q8NGjjwfG=jp&FSWm?Q&>uZ|bdB4Af3R@rz;pnOg@uKygpe(c&Yu;~(aWUm06;_2
zG~S7Ip;*=qbN~$ijhi=bUJ(SL!SVU?SU1%=ihZ=Twe>HqT7Qa#%P33-PzO-IdGqF#
zrh<9#0hTbaOLyREnzp&Qx%m&ST7Mo3mrUDe*7}!Ue))Go2p{J9P%In0Xgk;eP``KY
z-k-T@{aJzAV4>l_y>sWz4NcRoa=88!>lM9r0PHL-F8<B7Z9Zt|5G*?}!>YEXX<Bu4
zb@fkNwVf;0OSN^%625x;`0*7E7a)WPomhdFYIgwC0Mx$t;)}l+hH;PU^_#s1ofglX
zj1M0^yfr#HIw6W;BCJps7Z*SBvmME8(BQ<cnx<*hyLa!-6GG~t^;c2sc%K*XfJ<A#
zlhxJLTg%JKzYi;1KVbLDwmSfx0C=*twsw1YdHD}vgzFdVek|b$04=O=y8*i|OK8Fk
zoh?Kn5&w!Ul}dXK8~|vPa(@?=bqQU8rQni1@~sA7du?s)*7fVxe`{IR1_$d8uEoqH
zwBTx*_TZCGKKad{PufV56wJ1I2Cmgkxd665|NQg$`}gnvaZr6X5XJ6c3%Uo~t)-=<
ztJkhw`*owy_}`$ZSCS;(Lt5l=IoJ29)oQ!kORusax~}W1tE&r&qEzGY_{*XwMh5}x
zsZ*yu3KT2@*KJ2RyLrR{U{|ZvudCJSf0D^0VzJn({SJ0&YASfJ6kGwjH#fJ1tLu7w
zeSLjd)3k+TGMP{mWwc+xPESww1}p;?ZIo-VwN|TX_wV2TYI}QoA(cw?CE(Xzf4z5L
zou6T>!OIqQ?a~2YI)EQMcyKkDOhT6BOuu;W%*;%0!R|x7HaxaKIaSy7o%Qwg+bb(8
zpQ@_*K$0XyQIy<423x6AK9Zi-hdD#wrKKe|_3na6P3ko8&67oyrKP1$0bENalS8k(
z^2$^ym70jh<E4YPfm)IzNYDF2OQjN7T3Ql3A{afPBQ@d56kr*EqG?*~#*G_Q0RIFa
zmrA9nR4P@7Mx)1NSw0d<upa6a7)uZ-<w{_l(!{jorjkDcASIK@<e@`{j%6~LZz+m$
zR8f@CNF<UD1=xK8rYF){54&hq_K{dE_}bI*;O^bK3)H`h<n#HL6h(<=GMNG)M35wD
zSeE7C=AR;{s`_$J-%FO|19x*sfjREFUpSt9sz`(a&9>PpQb&>c-2&65Ki^lma^=cj
z59%OYVA?DI77`233nU9w#IskL5dhqOO9vDz@px@h04%saZKNH<c0dDBYs+W*AaCyn
zvX`obHmAH7(9nS04`g-$2|NJq7pM?6uwIbqMB&vD?sW`It^E$RQ#E4`fP6I{FTC*5
y%OD<_vY*+oZZB{OVZ3Ky^S<MI!S9Of{|5jFX8iKFAO>Xs0000<MNUMnLSTZkxVm}(

literal 0
HcmV?d00001

diff --git a/res/drawable-hdpi/jog_tab_bar_right_end_confirm_red.9.png b/res/drawable-hdpi/jog_tab_bar_right_end_confirm_red.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..fd98571d3d3fe0590b8e362008019d1ac7c969d0
GIT binary patch
literal 6029
zcmV;87jo!{P)<h;3K|Lk000e1NJLTq003410052%1^@s6t2_U-00009a7bBm000XU
z000XU0RWnu7ytkYPiaF#P*7-ZbZ>KLZ*U+<Lqi~Na&Km7Y-Iodc-oy)XH-+^7Crag
z^g>IBfRsybQWXdwQbLP>6p<z>Aqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uh<iVD~V
z<RPMtgQJLw%KPDaqifc@_vX$1wbwr9tn;0-&j-K=43<bUQ8j=JsX`tR;Dg7+#^K~H
zK!FM*Z~zbpvt%K2{UZSY_<lS*D<Z%Lz5oGu(+dayz)hRLFdT>f59&ghTmgWD0l;*T
zI7<kC6aYYajzXpYKt=(8otP$50H6c_V9R4-;{Z@C0AMG7=F<Rxo%or10RUT+Ar%3j
zkpLhQWr#!oXgdI`&sK^>09Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p
z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-<?i
z0%4j!F2Z@488U%158(66005wo6%pWr^Zj_v4zAA5HjcIqUoGmt2LB>rV&neh&#Q1i
z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_<lS*MWK+n+1cgf
z<k(8YLR(?VSAG6x!e78w{cQPuJpA|d;J)G{fihizM+Erb!p!tcr5w+a34~(Y=8s4G
zw+sLL9n&JjNn*KJDiq^U5^;`1nvC-@r6P$!k}1U{(*I=Q-z@tBKHoI}uxdU5dyy@u
zU1J0GOD7Ombim^G008p4Z^6_k2m^p<gW=D2|L;HjN1!DDfM!XOaR2~bL?kX$%CkSm
z2mk;?pn)o|K^yeJ7%adB9Ki+L!3+FgHiSYX#KJ-lLJDMn9CBbOtb#%)hRv`YDqt_v
zKpix|QD}yfa1JiQRk#j4a1Z)n2%f<xynzV>LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW
zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_Ifq<Ex{*7`05XF7hP+2Hl!3BQJ=6@fL%FCo
z8iYoo3(#bAF`ADSpqtQgv>H8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X
zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ<AYmRsNLWl*PS{AOARHt#5!wki2?K;t
z!Y3k=s7tgax)J%r7-BLphge7~Bi0g+6E6^Zh(p9TBoc{3GAFr^0!gu?RMHaCM$&Fl
zBk3%un>0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4
z<uv66WtcKSRim0x-Ke2d5jBrmLam{;Qm;{ms1r1GnmNsb7D-E`t)i9F8fX`2_i3-_
zbh;7Ul^#x)&{xvS=|||7=mYe33=M`AgU5(xC>fg=2N-7=cNnjjOr{yriy6mMFgG#l
znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U
zt5vF<Q0r40Q)j6=sE4X&sBct1q<&fbi3VB2Ov6t@q*0);U*o*SAPZv|vv@2aYYnT0
zb%8a+Cb7-ge0D0knEf5Qi#@8Tp*ce{N;6lpQuCB%KL_KOarm5cP6_8Ir<e17iry6O
zDdH&`rZh~sF=bq9s+O0QSgS~@QL9Jmy*94xr=6y~MY~!1fet~(N+(<=M`w@D1)b+p
z*;C!83a1uLJv#NSE~;y#8=<>IcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya?
z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y
zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB
zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt
z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a<fJbF^|4I#xQ~n$Dc=
zKYhjYmgz5NSkDm8*fZm{6U!;YX`NG>(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C
z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB
zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe
zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0
z?2xS?_ve_-k<Mujg;0Lz*3buG=3$G&ehepthlN*$KaOySSQ^nWmo<0M+(UEUMEXRQ
zMBbZcF;6+KElM>iKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$
z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4
z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu
zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu
z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E
ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw
zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX
z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i&
z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01
z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R
z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw
zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD
zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3|
zawq-H%e&ckC+@AhPrP6BK<z=<L*0kfKU@CX*zeqbYQT4(^U>T#_XdT7&;F71j}Joy
zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z
zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot<a{81DF0~rvGr5Xr~8u`lav1h
z1DNytV>2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F}
z000cQNkl<Zc-ripZE##w8ONXJ+}%ymyfvkzwFOM*^aWZ6f!b2bh*Omrm8l;rC`FWU
zMg&GJ&Y&~;L1+9T4lura5JVkkq%8$UDq}?$Y+*(O+lIDKN<))0X_K@~Y_pqWckkYp
za~?nBZgTeK-n(x%A-j8?&Y8Q}q<7O_|NB4B^PIc)AQ3^>frvyz2r9yj+4#?@v_J(S
z^mnU*prTT(006YGZMKZ(sv;uJF*-|7smNp10MCN0p97%zhWvBrbH0iLyC7t>1_2cw
zkA=tg+|Vluau#g!EP(X`Dx~55+H1IhR|MoN*o7h6Kt7=I;L_3SvHUX?13A+F_|wq-
z$o-3EL9N0EtQ($t*glWlu;ug4JHQeB>=1Nbeb-}QmL3;)>MQ~h0Khnz@dTN10HDsy
zNN<80sTan320dWfuE#b2SU%tLgFFTG=&G;HI^dhScll#@=boLQ|D)&KP+yTDPL+0u
zfEoipKtMM2b)3xM39{nDLO<V`8R>Z~HE^!a98bES%ENX&_Jf==>Ak(`o>>EYbN6n4
zu*bgo9Z2u%dMD(9dAjrf0Avia&mkfJV}J}17@LI77-B?&IGMwPJlXrc74LoG($V8C
zu%<ICALwqo$N}6r3xGESfqna~hamIf>38PbgtDL+LtqG~X_K%c8la{jMl?7lQe7vk
z%kTX;aq4)VIX*7IH37hofO|o9+eGMagTO`v5m1i4<|v2&2!I54p0EKB2{nemkdQH0
z5sj?9D!Tl-FI;)`odY7(^_Dq&_=!tLk2z2c39#W(v}_fag_{L&WESmVN;ikLe;drd
zhwQOoDq7PJH3k@sAVxLRH5fZ-Cpw=PJ$kU;93OL_W+cFdOU1T_2gBi2JIaQ;v3rmI
zum9$k?+3oWcm9F(f*hH&2o{SXMkClGCXPNecJk#nQbXq@z!?d&4A{$m%K{t(mN`~1
zzXuVJAP}ZaTsO&1>SRx(MTb>)<72Ixe*Dbx+rN2h<BARdXpu$}05k$X0|3-Hji!jx
z$z$2h-p1}dSnBT;n8$J=pi1g-5CPbNfOA0G2GmSyuZ!LIi`I=dbv9i-@XPq|gZ<|C
zr~^`$U}hDZ_1<hTAvSgI!T+whJ5&fvkf_YQ91)PsNtiZ?v_U+ji<@EL*55Dr^ba1s
z;>OLAa+@9HE^yQvlhn(y>b<4=*-$5N#)X*wR*=Uggw2T?7TKu`)#-NY_SiLF-@D@T
z54Oizu5`dQJJztkWeu_|;4R(HVpvwdgdoVCxS|IUl4XO?4dO|imK)l2e_FitCz5)-
z;Kn57A^_m#kd(`KrCNcXLkI$4aT2;gnr_6l$FBLt(;wNoBad>kJ{%fcCWHX0wm&35
z*f!a^L3T1N*4ho5_g{6#kJ_UxO9GUuxs{vmbqW9r)j5cOTbyj&q$XV~eR9cdKit-G
z?V3Ewor3$x?!8#D$MR~wSc3@2vPoo2YRK5FI~&(Ow5|Et)ehJ!+<G6lu%&x%Nw&a9
zh`ehf)iAit$<_^l88i0X#&r+g(cG~{Dk6fi1=!NP7ro9ISRe=zl~o{=Ik8d3AO;lM
z*|_cj0C;NuMBfKKOG+TGfE3Fpn{L%ikRT8llbB(}b~dhi;Ev{w)sAWd%im9RKZnIx
zfzvjur6B|%&zOLQRrkHdbq{T8zIII^mQV~_M%A1Z1Pmbvc*Z0&tk`{xt9Nw7S{F-T
z>!s2+2X4VxK`mdxnYD#x6PEsb@#b&&s5Ymka9e?@Wk599maEYrxB#9p=?VkeA6v3z
zn*%l|zlGbnpTm5DWa^@00J1spj7cAd*3aDAdfmq)JE)iX2|1QfkYZI#!W9{l?rdnk
zyCc@JIA7uL>7M5?7_1-=poSm;+_EWV@Ye4yyy1(EYTaG1LRCvy#iAO3Bm@e>qBWvv
z%e}2@*Grb*x3q)G3JSFZE<hM2ZEtA5+kx8P<F)xcwibE?1rMhq7BxicPZw{xT~e&O
zXvo6#RBZ$*Z8339@>>pITCkz9?X&H%mN)y&@$B^qG4Q!gL0Lh8A#6^}<aH0UtlJup
zda>XFp$1FZf|}%}Mb~5Vt?jXvHYq!p(Gd5t1EttJ6B)Cp?*5kRw@N-+Q0m2ilsW^K
z)-4-WLDL48V)Lq&0n}dGu$aMZ4s{kRe5CEBEiSlPQ0m20LQue(nayE+WZ^~!YRsot
zaDnw)l~6+-#5rBTwT?{<%a*z9K+X<OO<qOkwE~1?)3ya4-JD0UQ*a|h`BxlO01y|n
z5}P&vz~3aWZn!jEd4a0D3Iofbo<~|g(Xe#c5q&u2F@d3)yh@zJgw5e|4J&T&QEX1f
z%TcU~!n~GXC2Ls^05AJk!IT{+#TMzai$tWu0qV{Qm?{uTz8*oKusM9CdG*==#VU_2
z)ehE0+g3?XH7~d-D=4;|C^#*G=!zhyPNN$X)}qJ~v_fRLWChGM5TJmy8x`)Xi=duk
z>ow8lCWoJ&$11%R-INgmZmC~(wMSNfO0i|Z1z4&zEcPi5aLQwaa@k^2188HhMJ}i;
z*9sKWQhb)0DbnUOX(=lxGc#xgZIPc1I94!qiIIvTvjY#PYVs-<>H>(gLBR62GkK{f
zHe$pU`l(e-US;I6uB$ZV$o2|UN4B(7mfSE^cWW+!?dW+^EpS8l_k>}fOm=n@t8&<|
zx(B&Jj_g^v8LR;%+EPeDz<q30fly-T#1lc*tMb@V0uj={<3V$ovoxbN+$nx`LV$pq
zwJR$qNw5ehu;SozGhhX_jF=!>1}lGhMk%%&8;Fy68N9a?P>L<X3UEYZE<wP(!PP2l
ziCMuBV`KmV?rg6VTS8=jCkE_f5@v3Gp{$@BwT_{E9;WX@>$Qc80$WO|6-R3b{I>^C
ziY+xG=(5L7L-5`U3T)AeWei_P_jN(;&LK*%<;EzOXJC4J7I#(v3T$a=g|m=;4`yyI
zq!e2gSdHQ9=EdVaV3o&~oWG(-95XLn1piGdlogbczxHAJFwETg$_K34Qn^qYfR~M-
zw;*?;AU9OyvBgH5S$&QTxc9FS$_mQJ2D&JD2xe|=<!J*7Y@w4Dqp_z_r~U)EJ1)r+
z7bvi$Pg-94gn2H@sL88<5D}KyZJap(xtp*B+JI7Q0ct%B$$t;n$+%0gfofG?^90vW
zchs8Q)z0*&w!mAl$_aecdIHA(HDD)4C8(w=%_4uWimYdt8YF&|KKTmdZggpRs8xAv
zF?s7h#l<}iRNco00z+AWhXtHr={NRe`cFtu4WFVwSwRuSK;n-^&wdB0UQCLm6dPax
zuh8(GL7ut<0BH}kPC@<4$}a`NWvIwbS->ea@#?-z|GSa}WJ*yh5usA76A8`kdo=yt
zi;hy$k_{BC)=9;xk`|JhxbV1f>URK;3V<pAfC_<%h{_5$Lw%nZ+AaC2oL*VQSb!W6
zR>O+r4E5dO>~9a67e4S&D=*dproh&!6>x_7E^+qB*QTMSJS>10V*xoHTZ@WyK}||f
z%eH`;wSw&1-=);hETAUAW*8-&7w7(P(7bS3QfgU+K+S_qYU0A9=KH^PW`EgJb?|9m
zmkM<fEUWScm(x`Fnf~rxN1Z8GTIKcjFAFLFKt!uz#o7q^>oBr+mwx83R8gf}<!Y!(
zm8^hOrAkMbdGa^r2hR-h)MZJbvP#X_Q0lZ|tIP^Aj1q6q|Mu<D&m56p$`h1tZ#68a
z)irq`!YQ11b+^@jz)`90>Qc#l)hyKP2j3t}sE)_7iU&G~na;o3=UzHyj}A#7bxEOK
zDlI#u%99mfH2^*Dz{_|j)bCo>S%X@Uiq%mh`XPN}x7B}OP^1zPP+6VsOM&J@rInY*
zBEm2j@1KCNL%WPKM_mBr$8!4Q{(u|J71a4Xc{wn9A$j5@>-@1nks6cWnUZhH>hw~m
zm`kA3U^Q*tu$%z<!U!{a`zY1D%Q$n)1<dq-=!WU#qjL^*5^OZ`p?T#v*yl&V9O|O+
zp11AMvx6cvA-#pY;8`ATbq)a^Z=Y+R64+?yC%p`2KSM?U07<e&Cy>Vxfx5(a?*v(?
zgVx1!E`{0B(RRVLJ-*Mu|0C@mD$r@L3mV`)^U%W~oJ;<I1G)aOG5{_ey@u`c*bk=g
zczw9D_r(u)ig1pbLV^k~^Nv2k18xv#;Q^7u%v*$z$Lr3U$Qo=Sr1OyvTra>uu)S0{
z?_qj@otOo%`2dp#IKTT?RRl~gu;~z?77Ex49C`fRih=3nvGpOIGaulfW5t5>0~>ag
zKxI6qLWK$y)e>d5wy1zR&DG-dVMt}(f)5c3y282E!2W*#o|Z-V+!#Ag00000NkvXX
Hu0mjfS_f)D

literal 0
HcmV?d00001

diff --git a/res/drawable-hdpi/jog_tab_bar_right_end_normal.9.png b/res/drawable-hdpi/jog_tab_bar_right_end_normal.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..49ec1184fd04cec4e68670ab0b92bea85731296e
GIT binary patch
literal 3332
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
O0000<MNUMnLSTY;k|7ZQ

literal 0
HcmV?d00001

diff --git a/res/drawable-hdpi/jog_tab_bar_right_end_pressed.9.png b/res/drawable-hdpi/jog_tab_bar_right_end_pressed.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..ffc54339d58aae2ede2607d8e097531933175044
GIT binary patch
literal 5754
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

literal 0
HcmV?d00001

diff --git a/res/drawable-hdpi/jog_tab_left_confirm_green.png b/res/drawable-hdpi/jog_tab_left_confirm_green.png
new file mode 100644
index 0000000000000000000000000000000000000000..23acc95f1752db20993a7e978b9dc5b89f26906c
GIT binary patch
literal 5039
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
FV1l!iQqlkb

literal 0
HcmV?d00001

diff --git a/res/drawable-hdpi/jog_tab_left_normal.png b/res/drawable-hdpi/jog_tab_left_normal.png
new file mode 100644
index 0000000000000000000000000000000000000000..18216f9460f8d36fe55b55e304dcb6a4ed807995
GIT binary patch
literal 4523
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
JPDHLkV1m5vQ#Jqq

literal 0
HcmV?d00001

diff --git a/res/drawable-hdpi/jog_tab_left_pressed.png b/res/drawable-hdpi/jog_tab_left_pressed.png
new file mode 100644
index 0000000000000000000000000000000000000000..86f49c685b6850fd743103ffd2a671c2f7c18d94
GIT binary patch
literal 4437
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
blB4v0i0N9p=A%!W00000NkvXXu0mjfj8IT5

literal 0
HcmV?d00001

diff --git a/res/drawable-hdpi/jog_tab_right_confirm_red.png b/res/drawable-hdpi/jog_tab_right_confirm_red.png
new file mode 100644
index 0000000000000000000000000000000000000000..bb0fa47540913ca35d02c7c3c8e4484fbc1b8abc
GIT binary patch
literal 4684
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
O0000<MNUMnLSTYox6R`K

literal 0
HcmV?d00001

diff --git a/res/drawable-hdpi/jog_tab_right_normal.png b/res/drawable-hdpi/jog_tab_right_normal.png
new file mode 100644
index 0000000000000000000000000000000000000000..68545ef515ea0dbbd4288e0d9695aca61d494030
GIT binary patch
literal 4241
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

literal 0
HcmV?d00001

diff --git a/res/drawable-hdpi/jog_tab_right_pressed.png b/res/drawable-hdpi/jog_tab_right_pressed.png
new file mode 100644
index 0000000000000000000000000000000000000000..3d75c0d9be88a52b43d570dbd4d6e7990a804f12
GIT binary patch
literal 4148
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

literal 0
HcmV?d00001

diff --git a/res/drawable-hdpi/jog_tab_target_green.png b/res/drawable-hdpi/jog_tab_target_green.png
new file mode 100644
index 0000000000000000000000000000000000000000..17f6b101e727c3feeba052855803909892a1d81d
GIT binary patch
literal 1119
zcmV-l1fctgP)<h;3K|Lk000e1NJLTq000;O004>z1^@s6u-S^R0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU$0ZBwbRCwC#neT5DMHt6tXLj%Q?x3Z$
zEf$&xMGA<Pi(=6i5J1ZdjDduNiZOwZH1Ll9LSGo;D}TjT#z^7|6MdnHkThV7p%PPt
z2AjiPYv|G1R_^w0f6xB#nccnGT&}d#@WSMo<eS-@ndkY;JkRXRi<QDKB#*OD@|X((
z5P$##AOHafKmY;|fB*y_009U<00Izz00bc5zm;5~H5X}>eg=95)CbzS=h+>tqVf0f
zNe!wJ=nv31$X^fOrA$^mdhya5FXms^-QU^0sW%LQ*oacHFk30!8Y|rX@cqj_Tc$k%
z%{LweaO|~{hlkEyIB`l&1+5M@3HKZlgfW0hlqhnVq?Ii3T&jKc$v0np`}MUiq3cSs
z5HyzKZ=HXA_{{miA&XZsRb!Euwni*RCyr~z;&E-e2GD$U;N|D~Q;NC)R-}Xd-G>1V
z9C~H{@R{LPPigu*tC@d;BZIiUO?=-ae!ye-oN##O+>T&g;L^SOcJ?jIRq3Bo_e)8B
zq9QNfva-zHJbmuSpr+3;-Ks=R<FJG)rjUA+xSp5*XTtWU>tl<a=ih|Rpm7DypE!MZ
zXji_ozp5`1ms>D1PJ+OPS^H7lD3NqOjGx7-vKulvMpSKLeEJUfn{E8i@_Y96^crRb
z!UE1c7sMm^o(B#Z1a0+xF;>{<U@LqGU(G_ab5n=fWjh+|7zj<^E$y0Bj|13M0S$@c
z7^LILC$>P--e!Q!ayrbJrW4OlgkX(;Kne+iG`ZX%S=G-#Q)km8bIyY>^jVZtFe1?p
zq;L&~K|C&mymIaa%R|2$pc%StF_kKmNsvI0B(3SRkzgF9vGkg4LSwnvX<8^vmn(`a
z6UG>bMxvB184GZv`a7jd<AjYYD`aM>ESyg?1B{GbD=ef^nP{L~2gxh}f@q@pd(tPy
z3Y#?83LnB(vk=`GADg~0Q|#Z~y-jVW5Ta<mCm&kakP9h_y%g;r8i7+}rdWF*d<b7F
z9Tj}yR%!ph!Ch@?R*}W2$!I-H%T^ExX3Z2>K`J`<97A$Gdi(pkw&i{Reu^sriZGz1
zaC>fBe&FerY%VPe#}u5gr5YTI8XU{QImoDn&d2Xuom`l!d;vZ_U+px#S<}pxUw)kI
z>F8=_Jx_J25NC-|$P4>-)}oeaI{a<4RQ~kcEB6-XwaZ}pUi}PO?LH76%W-ipZ0>G9
zdT21;(%ZKs)7q9(qWxSpc(HKb`r+!Y)xTyRj3oEKcOdIgZZxq0wkKES0niRmThb@C
z;v{G^N$3>FThE;=N*dG!+L%0x;(%(P`Q#bP`iq3W+!25P1Rwwb2tWV=5P$##AOHaf
lKmY;|fB*#izX1OTFaU7h%oScZRAvAG002ovPDHLkV1g1(2lfB}

literal 0
HcmV?d00001

diff --git a/res/drawable-hdpi/jog_tab_target_red.png b/res/drawable-hdpi/jog_tab_target_red.png
new file mode 100644
index 0000000000000000000000000000000000000000..8db20bb6333337df212eebe1623dbef6dfb58c56
GIT binary patch
literal 1123
zcmV-p1f2VcP)<h;3K|Lk000e1NJLTq000;O004>z1^@s6u-S^R0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU$1xZ9fRCwC#na^(<RS?H#_w6so#%)rX
zs)V8@r4bacP*iXQR27k0p_T(u1(7QC*h4wM3Bidw2M!$g0}uj%5S##^3Ie^L(j-Ww
zkXFQX3&AyYT6^s{-ru{->~0myI7u7S1JXSCYd^m?GoN`s_PxVOQ53<wEHd2V!T<&^
zfB_6(00S7n00uCC0SsUO0~o*n1~7mD4ES#)o9d2>v_Zc>?L&>DMhd&fwov0Q*UC-&
zsh~=zUs1tk00*+VG5N+zuRK-UGhP_UZyk$*FmVzxR9a?v=4$EUJ70Wqe#Nn;vH9HH
z0FJ!;%%Q2*kGyzX_kt~cy91%)K;$QhN{Rqk*Fnh*fTN1$duP7<{Ieg=eu`aZ`b|M^
zIePl=u~V-;J2@3D)iZYOCb)GI+*TX>_6qnb9q>?8_fW#~jf0OqUQi7qH(Oq4qyNHs
zfZ_{<iBqo~c>cJ3{f2OAx4_51fo0<eTnIfck?TT$|AUT=K#Th1iP4A0E1hMzbfa2H
z*C#GY_m)+JIC1*vLx-)!s&MO#IA}cY@jHen{;W<cen}FphlL5m5JA4*{&wM}9|SXK
z5cZB>;$-pQR581)VAYnA%rM)?_Yo4rpeRg5^|&p75bGhX4cX>&BO4AF%?p41F^}=8
zy(4&X|M19|jhWLNM_v**$vRql6VgWr2%`|lmtuT?v9NQl7qEAy(1+c20|FQ488ZjU
zG!5Rn-BxD{dvH`TPNR#vZC7sF1K9jnzctul_+i$;?HFKi0?>3owDF@VMRH<h+mLaC
z4A!>yU1Z<&Lhu72g%OY-yn`1=5iwGG9C6^fVfPu=4QRGJ$I45R8t)D%c1w5AdLu||
zNdjehP6t~X{Z7;0OKsCsR239i2GOn5`Csa?As_NxXqy!LazDWIH;bhuHIo5B5QQW_
zi1kG_ilW3mYQ_MHL9zM)=FeCEJa@@ksVitGbPa^2#aWTFpdj6%B&Z#21f5IhbII$}
zDF($_>!|Q%Z&mkCKD2i*tEf0?86=d9nZ{CXOG%_ENg{>@O-***oSR<gc;5RMr@R)R
zj0X8Rv$p%WU1Ry2rYjUMK0Vddpt7dMN`mW97vQ}0^AA_9FE>BJ7$0tQn$DQEmH)1K
z?ZF*`Lt=FBenY5=B;$0%ii2x-Tx%d1dUUq&cjN8Z?-#4>*2n1k?(H*Zqx*m!mZNkp
zjBFj6Jod;F`F-1WW`;5YDs|SajyJzlwZ6K1u~jka)9F3%HOji18;zck(e%nJqV}K$
z(>~gYS5QBt3wjmhZ{|*>qN9dU_oa0z4r&=yOY2-VUnG9z&Hx55fB_6(00S7n00uCC
p0SsUO0~o*n1~B0N1^7pR0RWZlvnGP#>^1-Z002ovPDHLkV1h~234{Ou

literal 0
HcmV?d00001

diff --git a/res/drawable/jog_tab_bar_left_answer.xml b/res/drawable/jog_tab_bar_left_answer.xml
new file mode 100644
index 000000000..32ce3dcda
--- /dev/null
+++ b/res/drawable/jog_tab_bar_left_answer.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     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.
+-->
+
+<!-- StateListDrawable used for buttons in the in-call onscreen touch UI. -->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true" 
+        android:drawable="@drawable/jog_tab_bar_left_end_pressed" />
+
+    <item android:state_enabled="true"
+        android:drawable="@drawable/jog_tab_bar_left_end_normal" />
+
+    <item android:state_active="true"
+        android:drawable="@drawable/jog_tab_bar_left_end_confirm_green" />
+        
+</selector>
diff --git a/res/drawable/jog_tab_bar_right_decline.xml b/res/drawable/jog_tab_bar_right_decline.xml
new file mode 100644
index 000000000..83183ac1b
--- /dev/null
+++ b/res/drawable/jog_tab_bar_right_decline.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     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.
+-->
+
+<!-- StateListDrawable used for buttons in the in-call onscreen touch UI. -->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true" 
+        android:drawable="@drawable/jog_tab_bar_right_end_pressed" />
+
+    <item android:state_enabled="true"
+        android:drawable="@drawable/jog_tab_bar_right_end_normal" />
+
+    <item android:state_active="true"
+        android:drawable="@drawable/jog_tab_bar_right_end_confirm_red" />
+        
+</selector>
diff --git a/res/drawable/jog_tab_left_answer.xml b/res/drawable/jog_tab_left_answer.xml
new file mode 100644
index 000000000..18ec7fa15
--- /dev/null
+++ b/res/drawable/jog_tab_left_answer.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     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.
+-->
+
+<!-- StateListDrawable used for buttons in the in-call onscreen touch UI. -->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true" 
+        android:drawable="@drawable/jog_tab_left_pressed" />
+
+    <item android:state_enabled="true"
+        android:drawable="@drawable/jog_tab_left_normal" />
+
+    <item android:state_active="true"
+        android:drawable="@drawable/jog_tab_left_confirm_green" />
+        
+</selector>
diff --git a/res/drawable/jog_tab_right_decline.xml b/res/drawable/jog_tab_right_decline.xml
new file mode 100644
index 000000000..a3bca5e92
--- /dev/null
+++ b/res/drawable/jog_tab_right_decline.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     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.
+-->
+
+<!-- StateListDrawable used for buttons in the in-call onscreen touch UI. -->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true" 
+        android:drawable="@drawable/jog_tab_right_pressed" />
+
+    <item android:state_enabled="true"
+        android:drawable="@drawable/jog_tab_right_normal" />
+
+    <item android:state_active="true"
+        android:drawable="@drawable/jog_tab_right_confirm_red" />
+        
+</selector>
diff --git a/res/layout/incoming.xml b/res/layout/incoming.xml
index 1f3d8277f..401c254d0 100644
--- a/res/layout/incoming.xml
+++ b/res/layout/incoming.xml
@@ -4,7 +4,8 @@
 	android:layout_width="fill_parent" android:layout_height="fill_parent">
 
 
-	<TextView android:layout_width="wrap_content" android:layout_height="wrap_content"
+	<TextView android:id="@+id/incoming_text" 
+		android:layout_width="wrap_content" android:layout_height="wrap_content"
 		android:layout_centerHorizontal="true"
 		android:layout_marginTop="25sp" android:layout_alignParentTop="true"
 		android:text="Incoming call" android:textAppearance="?android:attr/textAppearanceLarge">
@@ -12,7 +13,8 @@
 
 	<LinearLayout android:layout_width="wrap_content"
 		android:layout_height="wrap_content" android:orientation="vertical"
-		android:layout_centerInParent="true">
+		android:layout_below="@id/incoming_text"
+		android:layout_centerHorizontal="true" android:paddingTop="30dip">
 		<ImageView android:id="@+id/incoming_picture"
 			android:layout_height="wrap_content" android:layout_width="wrap_content" 
 			android:layout_gravity="center" android:scaleType="fitCenter"
@@ -33,21 +35,13 @@
 	</LinearLayout>
 
 
-	<ImageButton android:id="@+id/Answer"
-		android:src="@drawable/startcall_green" android:layout_width="wrap_content"
-		android:layout_height="wrap_content" 
-		android:text="answer"
-		android:textAppearance="?android:attr/textAppearanceLarge"
-		android:layout_alignParentLeft="true" android:layout_marginBottom="40sp"
-		android:layout_alignParentBottom="true"/>
-
-	<ImageButton android:id="@+id/Decline"
-		android:src="@drawable/stopcall_red" android:layout_width="wrap_content"
-		android:layout_height="wrap_content" 
-		android:text="decline" 
-		android:textAppearance="?android:attr/textAppearanceLarge"
-		android:layout_alignParentRight="true" android:layout_alignBottom="@id/Answer"/>
-
+    <org.linphone.ui.SlidingTab
+        android:id="@+id/sliding_widget"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_marginBottom="80dip"
+        />
 
 
 <!--	<org.linphone.ui.CallButton  android:src="@drawable/startvideo_green" android:layout_width="wrap_content"-->
diff --git a/res/values/slidingtab_style.xml b/res/values/slidingtab_style.xml
new file mode 100644
index 000000000..81c1693f6
--- /dev/null
+++ b/res/values/slidingtab_style.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="TextAppearance.SlidingTabNormal" 
+        parent="@android:attr/textAppearanceMedium">
+        <item name="android:textColor">?android:attr/textColorTertiary</item>
+        <item name="android:textSize">28sp</item>
+        <item name="android:shadowColor">@android:color/black</item>
+        <item name="android:shadowDx">0.0</item>
+        <item name="android:shadowDy">1.0</item>
+        <item name="android:shadowRadius">5.0</item>
+    </style>
+
+    <style name="TextAppearance.SlidingTabActive" 
+        parent="@android:attr/textAppearanceMedium">
+        <item name="android:textColor">@android:color/black</item>
+        <item name="android:textSize">28sp</item>
+    </style>
+
+    <attr name="orientation">
+        <!-- Defines an horizontal widget. -->
+        <enum name="horizontal" value="0" />
+        <!-- Defines a vertical widget. -->
+        <enum name="vertical" value="1" />
+    </attr>
+
+    <declare-styleable name="SlidingTab">
+        <!-- Use "horizontal" for a row, "vertical" for a column.  The default is horizontal. -->
+        <attr name="orientation" />
+    </declare-styleable>
+
+</resources>
\ No newline at end of file
diff --git a/src/org/linphone/IncomingCallActivity.java b/src/org/linphone/IncomingCallActivity.java
index 540302b83..e21727c60 100644
--- a/src/org/linphone/IncomingCallActivity.java
+++ b/src/org/linphone/IncomingCallActivity.java
@@ -24,6 +24,8 @@ import org.linphone.core.LinphoneAddress;
 import org.linphone.core.LinphoneCall;
 import org.linphone.core.Log;
 import org.linphone.core.LinphoneCall.State;
+import org.linphone.ui.SlidingTab;
+import org.linphone.ui.SlidingTab.OnTriggerListener;
 
 import android.app.Activity;
 import android.content.Intent;
@@ -32,7 +34,6 @@ import android.os.Bundle;
 import android.view.KeyEvent;
 import android.view.View;
 import android.view.WindowManager;
-import android.view.View.OnClickListener;
 import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -43,13 +44,14 @@ import android.widget.Toast;
  *
  * @author Guillaume Beraudo
  */
-public class IncomingCallActivity extends Activity implements OnClickListener, LinphoneManagerReadyListener, LinphoneOnCallStateChangedListener {
+public class IncomingCallActivity extends Activity implements LinphoneManagerReadyListener, LinphoneOnCallStateChangedListener, OnTriggerListener {
 
 	private TextView mNameView;
 	private TextView mNumberView;
 	private ImageView mPictureView;
 	private LinphoneCall mCall;
-	private LinphoneManagerWaitHelper helper;
+	private LinphoneManagerWaitHelper mHelper;
+	private SlidingTab mIncomingCallWidget;
 
 	private void findIncomingCall(Intent intent) {
 		String stringUri = intent.getStringExtra("stringUri");
@@ -68,15 +70,24 @@ public class IncomingCallActivity extends Activity implements OnClickListener, L
 		mNumberView = (TextView) findViewById(R.id.incoming_caller_number);
 		mPictureView = (ImageView) findViewById(R.id.incoming_picture);
 
-		findViewById(R.id.Decline).setOnClickListener(this);
-		findViewById(R.id.Answer).setOnClickListener(this);
-		
         // set this flag so this activity will stay in front of the keyguard
         int flags = WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED;
         flags |= WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD;
         getWindow().addFlags(flags);
 
-        helper = new LinphoneManagerWaitHelper(this, this);
+
+        // "Dial-to-answer" widget for incoming calls.
+        mIncomingCallWidget = (SlidingTab) findViewById(R.id.sliding_widget);
+
+        // For now, we only need to show two states: answer and decline.
+        // TODO: make left hint work
+//        mIncomingCallWidget.setLeftHintText(R.string.slide_to_answer_hint);
+//        mIncomingCallWidget.setRightHintText(R.string.slide_to_decline_hint);
+
+        mIncomingCallWidget.setOnTriggerListener(this);
+
+
+        mHelper = new LinphoneManagerWaitHelper(this, this);
         super.onCreate(savedInstanceState);
 	}
 
@@ -108,7 +119,7 @@ public class IncomingCallActivity extends Activity implements OnClickListener, L
 	@Override
 	protected void onResume() {
 		super.onResume();
-        helper.doManagerDependentOnResume();
+        mHelper.doManagerDependentOnResume();
 	}
 	
 	@Override
@@ -126,24 +137,6 @@ public class IncomingCallActivity extends Activity implements OnClickListener, L
 		return super.onKeyDown(keyCode, event);
 	}
 
-	@Override
-	public void onClick(View v) {
-		switch (v.getId()) {
-		case R.id.Answer:
-			if (!LinphoneManager.getInstance().acceptCall(mCall)) {
-				// the above method takes care of Samsung Galaxy S
-				Toast.makeText(this, R.string.couldnt_accept_call, Toast.LENGTH_LONG);
-			}
-			break;
-		case R.id.Decline:
-			LinphoneManager.getLc().terminateCall(mCall);
-			break;
-		default:
-			throw new RuntimeException();
-		}
-		finish();
-	}
-
 	@Override
 	public void onCallStateChanged(LinphoneCall call, State state, String msg) {
 		if (call == mCall && State.CallEnd == state) {
@@ -151,4 +144,33 @@ public class IncomingCallActivity extends Activity implements OnClickListener, L
 		}
 	}
 
+	private void decline() {
+		LinphoneManager.getLc().terminateCall(mCall);
+	}
+	private void answer() {
+		if (!LinphoneManager.getInstance().acceptCall(mCall)) {
+			// the above method takes care of Samsung Galaxy S
+			Toast.makeText(this, R.string.couldnt_accept_call, Toast.LENGTH_LONG);
+		}
+	}
+	@Override
+	public void onGrabbedStateChange(View v, int grabbedState) {
+	}
+
+	@Override
+	public void onTrigger(View v, int whichHandle) {
+		switch (whichHandle) {
+		case OnTriggerListener.LEFT_HANDLE:
+			answer();
+			finish();
+			break;
+		case OnTriggerListener.RIGHT_HANDLE:
+			decline();
+			finish();
+			break;
+		default:
+			break;
+		}
+	}
+
 }
diff --git a/src/org/linphone/ui/SlidingTab.java b/src/org/linphone/ui/SlidingTab.java
new file mode 100644
index 000000000..c58670e39
--- /dev/null
+++ b/src/org/linphone/ui/SlidingTab.java
@@ -0,0 +1,844 @@
+/*
+ * Derived from Android "SlidingTab" source.
+ * Copyright (C) 2009 The Android Open Source Project
+ *
+ * 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.
+ */
+
+package org.linphone.ui;
+
+
+import org.linphone.R;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.Rect;
+import android.graphics.drawable.Drawable;
+import android.os.Vibrator;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.view.Gravity;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.animation.AlphaAnimation;
+import android.view.animation.Animation;
+import android.view.animation.LinearInterpolator;
+import android.view.animation.TranslateAnimation;
+import android.view.animation.Animation.AnimationListener;
+import android.widget.ImageView;
+import android.widget.TextView;
+import android.widget.ImageView.ScaleType;
+
+/**
+ * A special widget containing two Sliders and a threshold for each.  Moving either slider beyond
+ * the threshold will cause the registered OnTriggerListener.onTrigger() to be called with
+ * whichHandle being {@link OnTriggerListener#LEFT_HANDLE} or {@link OnTriggerListener#RIGHT_HANDLE}
+ * Equivalently, selecting a tab will result in a call to
+ * {@link OnTriggerListener#onGrabbedStateChange(View, int)} with one of these two states. Releasing
+ * the tab will result in whichHandle being {@link OnTriggerListener#NO_HANDLE}.
+ *
+ */
+public class SlidingTab extends ViewGroup {
+    private static final String LOG_TAG = "SlidingTab";
+    private static final int HORIZONTAL = 0; // as defined in attrs.xml
+    private static final int VERTICAL = 1;
+
+    // TODO: Make these configurable
+    private static final float THRESHOLD = 2.0f / 3.0f;
+    private static final long VIBRATE_SHORT = 30;
+    private static final long VIBRATE_LONG = 40;
+    private static final int TRACKING_MARGIN = 50;
+    private static final int ANIM_DURATION = 250; // Time for most animations (in ms)
+    private static final int ANIM_TARGET_TIME = 500; // Time to show targets (in ms)
+    private boolean mHoldLeftOnTransition = false;
+    private boolean mHoldRightOnTransition = false;
+
+    private OnTriggerListener mOnTriggerListener;
+    private int mGrabbedState = OnTriggerListener.NO_HANDLE;
+    private boolean mTriggered = false;
+    private Vibrator mVibrator;
+
+    /**
+     * Either {@link #HORIZONTAL} or {@link #VERTICAL}.
+     */
+    private int mOrientation;
+
+    private Slider mLeftSlider;
+    private Slider mRightSlider;
+    private Slider mCurrentSlider;
+    private boolean mTracking;
+    private float mThreshold;
+    private Slider mOtherSlider;
+    private boolean mAnimating;
+    private Rect mTmpRect;
+
+    /**
+     * Listener used to reset the view when the current animation completes.
+     */
+    private final AnimationListener mAnimationDoneListener = new AnimationListener() {
+        public void onAnimationStart(Animation animation) {
+
+        }
+
+        public void onAnimationRepeat(Animation animation) {
+
+        }
+
+        public void onAnimationEnd(Animation animation) {
+            onAnimationDone();
+        }
+    };
+
+    /**
+     * Interface definition for a callback to be invoked when a tab is triggered
+     * by moving it beyond a threshold.
+     */
+    public interface OnTriggerListener {
+        /**
+         * The interface was triggered because the user let go of the handle without reaching the
+         * threshold.
+         */
+        public static final int NO_HANDLE = 0;
+
+        /**
+         * The interface was triggered because the user grabbed the left handle and moved it past
+         * the threshold.
+         */
+        public static final int LEFT_HANDLE = 1;
+
+        /**
+         * The interface was triggered because the user grabbed the right handle and moved it past
+         * the threshold.
+         */
+        public static final int RIGHT_HANDLE = 2;
+
+        /**
+         * Called when the user moves a handle beyond the threshold.
+         *
+         * @param v The view that was triggered.
+         * @param whichHandle  Which "dial handle" the user grabbed,
+         *        either {@link #LEFT_HANDLE}, {@link #RIGHT_HANDLE}.
+         */
+        void onTrigger(View v, int whichHandle);
+
+        /**
+         * Called when the "grabbed state" changes (i.e. when the user either grabs or releases
+         * one of the handles.)
+         *
+         * @param v the view that was triggered
+         * @param grabbedState the new state: {@link #NO_HANDLE}, {@link #LEFT_HANDLE},
+         * or {@link #RIGHT_HANDLE}.
+         */
+        void onGrabbedStateChange(View v, int grabbedState);
+    }
+
+    /**
+     * Simple container class for all things pertinent to a slider.
+     * A slider consists of 3 Views:
+     *
+     * {@link #tab} is the tab shown on the screen in the default state.
+     * {@link #text} is the view revealed as the user slides the tab out.
+     * {@link #target} is the target the user must drag the slider past to trigger the slider.
+     *
+     */
+    private static class Slider {
+        /**
+         * Tab alignment - determines which side the tab should be drawn on
+         */
+        public static final int ALIGN_LEFT = 0;
+        public static final int ALIGN_RIGHT = 1;
+        public static final int ALIGN_TOP = 2;
+        public static final int ALIGN_BOTTOM = 3;
+        public static final int ALIGN_UNKNOWN = 4;
+
+        /**
+         * States for the view.
+         */
+        private static final int STATE_NORMAL = 0;
+        private static final int STATE_PRESSED = 1;
+        private static final int STATE_ACTIVE = 2;
+
+        private final ImageView tab;
+        private final TextView text;
+        private final ImageView target;
+        private int currentState = STATE_NORMAL;
+        private int alignment = ALIGN_UNKNOWN;
+        private int alignment_value;
+
+        /**
+         * Constructor
+         *
+         * @param parent the container view of this one
+         * @param tabId drawable for the tab
+         * @param barId drawable for the bar
+         * @param targetId drawable for the target
+         */
+        Slider(ViewGroup parent, int iconId, int tabId, int barId, int targetId) {
+            // Create tab
+            tab = new ImageView(parent.getContext());
+            tab.setImageResource(iconId);
+            tab.setBackgroundResource(tabId);
+            tab.setScaleType(ScaleType.CENTER);
+            tab.setLayoutParams(new LayoutParams(LayoutParams.WRAP_CONTENT,
+                    LayoutParams.WRAP_CONTENT));
+
+            // Create hint TextView
+            text = new TextView(parent.getContext());
+            text.setLayoutParams(new LayoutParams(LayoutParams.WRAP_CONTENT,
+                    LayoutParams.FILL_PARENT));
+            text.setBackgroundResource(barId);
+            text.setTextAppearance(parent.getContext(), R.style.TextAppearance_SlidingTabNormal);
+            // hint.setSingleLine();  // Hmm.. this causes the text to disappear off-screen
+
+            // Create target
+            target = new ImageView(parent.getContext());
+            target.setImageResource(targetId);
+            target.setScaleType(ScaleType.CENTER);
+            target.setLayoutParams(
+                    new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT));
+            target.setVisibility(View.INVISIBLE);
+
+            parent.addView(target); // this needs to be first - relies on painter's algorithm
+            parent.addView(tab);
+            parent.addView(text);
+        }
+
+        void setIcon(int iconId) {
+            tab.setImageResource(iconId);
+        }
+
+        void setTabBackgroundResource(int tabId) {
+            tab.setBackgroundResource(tabId);
+        }
+
+        void setBarBackgroundResource(int barId) {
+            text.setBackgroundResource(barId);
+        }
+
+        void setHintText(int resId) {
+            text.setText(resId);
+        }
+
+        void hide() {
+            boolean horiz = alignment == ALIGN_LEFT || alignment == ALIGN_RIGHT;
+            int dx = horiz ? (alignment == ALIGN_LEFT ? alignment_value - tab.getRight()
+                    : alignment_value - tab.getLeft()) : 0;
+            int dy = horiz ? 0 : (alignment == ALIGN_TOP ? alignment_value - tab.getBottom()
+                    : alignment_value - tab.getTop());
+
+            Animation trans = new TranslateAnimation(0, dx, 0, dy);
+            trans.setDuration(ANIM_DURATION);
+            trans.setFillAfter(true);
+            tab.startAnimation(trans);
+            text.startAnimation(trans);
+            target.setVisibility(View.INVISIBLE);
+        }
+
+        void show(boolean animate) {
+            text.setVisibility(View.VISIBLE);
+            tab.setVisibility(View.VISIBLE);
+            //target.setVisibility(View.INVISIBLE);
+            if (animate) {
+                boolean horiz = alignment == ALIGN_LEFT || alignment == ALIGN_RIGHT;
+                int dx = horiz ? (alignment == ALIGN_LEFT ? tab.getWidth() : -tab.getWidth()) : 0;
+                int dy = horiz ? 0: (alignment == ALIGN_TOP ? tab.getHeight() : -tab.getHeight());
+
+                Animation trans = new TranslateAnimation(-dx, 0, -dy, 0);
+                trans.setDuration(ANIM_DURATION);
+                tab.startAnimation(trans);
+                text.startAnimation(trans);
+            }
+        }
+
+        void setState(int state) {
+            text.setPressed(state == STATE_PRESSED);
+            tab.setPressed(state == STATE_PRESSED);
+            if (state == STATE_ACTIVE) {
+                final int[] activeState = new int[] {android.R.attr.state_active};
+                if (text.getBackground().isStateful()) {
+                    text.getBackground().setState(activeState);
+                }
+                if (tab.getBackground().isStateful()) {
+                    tab.getBackground().setState(activeState);
+                }
+                text.setTextAppearance(text.getContext(), R.style.TextAppearance_SlidingTabActive);
+            } else {
+                text.setTextAppearance(text.getContext(), R.style.TextAppearance_SlidingTabNormal);
+            }
+            currentState = state;
+        }
+
+        void showTarget() {
+            AlphaAnimation alphaAnim = new AlphaAnimation(0.0f, 1.0f);
+            alphaAnim.setDuration(ANIM_TARGET_TIME);
+            target.startAnimation(alphaAnim);
+            target.setVisibility(View.VISIBLE);
+        }
+
+        void reset(boolean animate) {
+            setState(STATE_NORMAL);
+            text.setVisibility(View.VISIBLE);
+            text.setTextAppearance(text.getContext(), R.style.TextAppearance_SlidingTabNormal);
+            tab.setVisibility(View.VISIBLE);
+            target.setVisibility(View.INVISIBLE);
+            final boolean horiz = alignment == ALIGN_LEFT || alignment == ALIGN_RIGHT;
+            int dx = horiz ? (alignment == ALIGN_LEFT ?  alignment_value - tab.getLeft()
+                    : alignment_value - tab.getRight()) : 0;
+            int dy = horiz ? 0 : (alignment == ALIGN_TOP ? alignment_value - tab.getTop()
+                    : alignment_value - tab.getBottom());
+            if (animate) {
+                TranslateAnimation trans = new TranslateAnimation(0, dx, 0, dy);
+                trans.setDuration(ANIM_DURATION);
+                trans.setFillAfter(false);
+                text.startAnimation(trans);
+                tab.startAnimation(trans);
+            } else {
+                if (horiz) {
+                    text.offsetLeftAndRight(dx);
+                    tab.offsetLeftAndRight(dx);
+                } else {
+                    text.offsetTopAndBottom(dy);
+                    tab.offsetTopAndBottom(dy);
+                }
+                text.clearAnimation();
+                tab.clearAnimation();
+                target.clearAnimation();
+            }
+        }
+
+        void setTarget(int targetId) {
+            target.setImageResource(targetId);
+        }
+
+        /**
+         * Layout the given widgets within the parent.
+         *
+         * @param l the parent's left border
+         * @param t the parent's top border
+         * @param r the parent's right border
+         * @param b the parent's bottom border
+         * @param alignment which side to align the widget to
+         */
+        void layout(int l, int t, int r, int b, int alignment) {
+            this.alignment = alignment;
+            final Drawable tabBackground = tab.getBackground();
+            final int handleWidth = tabBackground.getIntrinsicWidth();
+            final int handleHeight = tabBackground.getIntrinsicHeight();
+            final Drawable targetDrawable = target.getDrawable();
+            final int targetWidth = targetDrawable.getIntrinsicWidth();
+            final int targetHeight = targetDrawable.getIntrinsicHeight();
+            final int parentWidth = r - l;
+            final int parentHeight = b - t;
+
+            final int leftTarget = (int) (THRESHOLD * parentWidth) - targetWidth + handleWidth / 2;
+            final int rightTarget = (int) ((1.0f - THRESHOLD) * parentWidth) - handleWidth / 2;
+            final int left = (parentWidth - handleWidth) / 2;
+            final int right = left + handleWidth;
+
+            if (alignment == ALIGN_LEFT || alignment == ALIGN_RIGHT) {
+                // horizontal
+                final int targetTop = (parentHeight - targetHeight) / 2;
+                final int targetBottom = targetTop + targetHeight;
+                final int top = (parentHeight - handleHeight) / 2;
+                final int bottom = (parentHeight + handleHeight) / 2;
+                if (alignment == ALIGN_LEFT) {
+                    tab.layout(0, top, handleWidth, bottom);
+                    text.layout(0 - parentWidth, top, 0, bottom);
+                    text.setGravity(Gravity.RIGHT);
+                    target.layout(leftTarget, targetTop, leftTarget + targetWidth, targetBottom);
+                    alignment_value = l;
+                } else {
+                    tab.layout(parentWidth - handleWidth, top, parentWidth, bottom);
+                    text.layout(parentWidth, top, parentWidth + parentWidth, bottom);
+                    target.layout(rightTarget, targetTop, rightTarget + targetWidth, targetBottom);
+                    text.setGravity(Gravity.TOP);
+                    alignment_value = r;
+                }
+            } else {
+                // vertical
+                final int targetLeft = (parentWidth - targetWidth) / 2;
+                final int targetRight = (parentWidth + targetWidth) / 2;
+                final int top = (int) (THRESHOLD * parentHeight) + handleHeight / 2 - targetHeight;
+                final int bottom = (int) ((1.0f - THRESHOLD) * parentHeight) - handleHeight / 2;
+                if (alignment == ALIGN_TOP) {
+                    tab.layout(left, 0, right, handleHeight);
+                    text.layout(left, 0 - parentHeight, right, 0);
+                    target.layout(targetLeft, top, targetRight, top + targetHeight);
+                    alignment_value = t;
+                } else {
+                    tab.layout(left, parentHeight - handleHeight, right, parentHeight);
+                    text.layout(left, parentHeight, right, parentHeight + parentHeight);
+                    target.layout(targetLeft, bottom, targetRight, bottom + targetHeight);
+                    alignment_value = b;
+                }
+            }
+        }
+
+        public void updateDrawableStates() {
+            setState(currentState);
+        }
+
+        /**
+         * Ensure all the dependent widgets are measured.
+         */
+        public void measure() {
+            tab.measure(View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED),
+                    View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED));
+            text.measure(View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED),
+                    View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED));
+        }
+
+        /**
+         * Get the measured tab width. Must be called after {@link Slider#measure()}.
+         * @return
+         */
+        public int getTabWidth() {
+            return tab.getMeasuredWidth();
+        }
+
+        /**
+         * Get the measured tab width. Must be called after {@link Slider#measure()}.
+         * @return
+         */
+        public int getTabHeight() {
+            return tab.getMeasuredHeight();
+        }
+
+        /**
+         * Start animating the slider. Note we need two animations since an Animator
+         * keeps internal state of the invalidation region which is just the view being animated.
+         *
+         * @param anim1
+         * @param anim2
+         */
+        public void startAnimation(Animation anim1, Animation anim2) {
+            tab.startAnimation(anim1);
+            text.startAnimation(anim2);
+        }
+
+        public void hideTarget() {
+            target.clearAnimation();
+            target.setVisibility(View.INVISIBLE);
+        }
+    }
+
+    public SlidingTab(Context context) {
+        this(context, null);
+    }
+
+    /**
+     * Constructor used when this widget is created from a layout file.
+     */
+    public SlidingTab(Context context, AttributeSet attrs) {
+        super(context, attrs);
+
+        // Allocate a temporary once that can be used everywhere.
+        mTmpRect = new Rect();
+
+        TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.SlidingTab);
+        mOrientation = a.getInt(org.linphone.R.styleable.SlidingTab_orientation, HORIZONTAL);
+        a.recycle();
+        mLeftSlider = new Slider(this,
+                R.drawable.startcall_green,
+                R.drawable.jog_tab_left_answer,
+                R.drawable.jog_tab_bar_left_answer,
+                R.drawable.jog_tab_target_green
+                );
+        mRightSlider = new Slider(this,
+                R.drawable.stopcall_red,
+                R.drawable.jog_tab_right_decline,
+                R.drawable.jog_tab_bar_right_decline,
+                R.drawable.jog_tab_target_red
+                );
+
+        // setBackgroundColor(0x80808080);
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        int widthSpecMode = MeasureSpec.getMode(widthMeasureSpec);
+        int widthSpecSize =  MeasureSpec.getSize(widthMeasureSpec);
+
+        int heightSpecMode = MeasureSpec.getMode(heightMeasureSpec);
+        int heightSpecSize =  MeasureSpec.getSize(heightMeasureSpec);
+
+        if (widthSpecMode == MeasureSpec.UNSPECIFIED || heightSpecMode == MeasureSpec.UNSPECIFIED) {
+            Log.e("SlidingTab", "SlidingTab cannot have UNSPECIFIED MeasureSpec"
+                    +"(wspec=" + widthSpecMode + ", hspec=" + heightSpecMode + ")",
+                    new RuntimeException(LOG_TAG + "stack:"));
+        }
+
+        mLeftSlider.measure();
+        mRightSlider.measure();
+        final int leftTabWidth = mLeftSlider.getTabWidth();
+        final int rightTabWidth = mRightSlider.getTabWidth();
+        final int leftTabHeight = mLeftSlider.getTabHeight();
+        final int rightTabHeight = mRightSlider.getTabHeight();
+        final int width;
+        final int height;
+        if (isHorizontal()) {
+            width = Math.max(widthSpecSize, leftTabWidth + rightTabWidth);
+            height = Math.max(leftTabHeight, rightTabHeight);
+        } else {
+            width = Math.max(leftTabWidth, rightTabHeight);
+            height = Math.max(heightSpecSize, leftTabHeight + rightTabHeight);
+        }
+        setMeasuredDimension(width, height);
+    }
+
+    @Override
+    public boolean onInterceptTouchEvent(MotionEvent event) {
+        final int action = event.getAction();
+        final float x = event.getX();
+        final float y = event.getY();
+
+        if (mAnimating) {
+            return false;
+        }
+
+        View leftHandle = mLeftSlider.tab;
+        leftHandle.getHitRect(mTmpRect);
+        boolean leftHit = mTmpRect.contains((int) x, (int) y);
+
+        View rightHandle = mRightSlider.tab;
+        rightHandle.getHitRect(mTmpRect);
+        boolean rightHit = mTmpRect.contains((int)x, (int) y);
+
+        if (!mTracking && !(leftHit || rightHit)) {
+            return false;
+        }
+
+        switch (action) {
+            case MotionEvent.ACTION_DOWN: {
+                mTracking = true;
+                mTriggered = false;
+                vibrate(VIBRATE_SHORT);
+                if (leftHit) {
+                    mCurrentSlider = mLeftSlider;
+                    mOtherSlider = mRightSlider;
+                    mThreshold = isHorizontal() ? THRESHOLD : 1.0f - THRESHOLD;
+                    setGrabbedState(OnTriggerListener.LEFT_HANDLE);
+                } else {
+                    mCurrentSlider = mRightSlider;
+                    mOtherSlider = mLeftSlider;
+                    mThreshold = isHorizontal() ? 1.0f - THRESHOLD : THRESHOLD;
+                    setGrabbedState(OnTriggerListener.RIGHT_HANDLE);
+                }
+                mCurrentSlider.setState(Slider.STATE_PRESSED);
+                mCurrentSlider.showTarget();
+                mOtherSlider.hide();
+                break;
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Reset the tabs to their original state and stop any existing animation.
+     * Animate them back into place if animate is true.
+     *
+     * @param animate
+     */
+    public void reset(boolean animate) {
+        mLeftSlider.reset(animate);
+        mRightSlider.reset(animate);
+        if (!animate) {
+            mAnimating = false;
+        }
+    }
+
+    @Override
+    public void setVisibility(int visibility) {
+        // Clear animations so sliders don't continue to animate when we show the widget again.
+        if (visibility != getVisibility() && visibility == View.INVISIBLE) {
+           reset(false);
+        }
+        super.setVisibility(visibility);
+    }
+
+    @Override
+    public boolean onTouchEvent(MotionEvent event) {
+        if (mTracking) {
+            final int action = event.getAction();
+            final float x = event.getX();
+            final float y = event.getY();
+
+            switch (action) {
+                case MotionEvent.ACTION_MOVE:
+                    if (withinView(x, y, this) ) {
+                        moveHandle(x, y);
+                        float position = isHorizontal() ? x : y;
+                        float target = mThreshold * (isHorizontal() ? getWidth() : getHeight());
+                        boolean thresholdReached;
+                        if (isHorizontal()) {
+                            thresholdReached = mCurrentSlider == mLeftSlider ?
+                                    position > target : position < target;
+                        } else {
+                            thresholdReached = mCurrentSlider == mLeftSlider ?
+                                    position < target : position > target;
+                        }
+                        if (!mTriggered && thresholdReached) {
+                            mTriggered = true;
+                            mTracking = false;
+                            mCurrentSlider.setState(Slider.STATE_ACTIVE);
+                            boolean isLeft = mCurrentSlider == mLeftSlider;
+                            dispatchTriggerEvent(isLeft ?
+                                OnTriggerListener.LEFT_HANDLE : OnTriggerListener.RIGHT_HANDLE);
+
+                            startAnimating(isLeft ? mHoldLeftOnTransition : mHoldRightOnTransition);
+                            setGrabbedState(OnTriggerListener.NO_HANDLE);
+                        }
+                        break;
+                    }
+                    // Intentionally fall through - we're outside tracking rectangle
+
+                case MotionEvent.ACTION_UP:
+                case MotionEvent.ACTION_CANCEL:
+                    mTracking = false;
+                    mTriggered = false;
+                    mOtherSlider.show(true);
+                    mCurrentSlider.reset(false);
+                    mCurrentSlider.hideTarget();
+                    mCurrentSlider = null;
+                    mOtherSlider = null;
+                    setGrabbedState(OnTriggerListener.NO_HANDLE);
+                    break;
+            }
+        }
+
+        return mTracking || super.onTouchEvent(event);
+    }
+
+    void startAnimating(final boolean holdAfter) {
+        mAnimating = true;
+        final Animation trans1;
+        final Animation trans2;
+        final Slider slider = mCurrentSlider;
+        final int dx;
+        final int dy;
+        if (isHorizontal()) {
+            int right = slider.tab.getRight();
+            int width = slider.tab.getWidth();
+            int left = slider.tab.getLeft();
+            int viewWidth = getWidth();
+            int holdOffset = holdAfter ? 0 : width; // how much of tab to show at the end of anim
+            dx =  slider == mRightSlider ? - (right + viewWidth - holdOffset)
+                    : (viewWidth - left) + viewWidth - holdOffset;
+            dy = 0;
+        } else {
+            int top = slider.tab.getTop();
+            int bottom = slider.tab.getBottom();
+            int height = slider.tab.getHeight();
+            int viewHeight = getHeight();
+            int holdOffset = holdAfter ? 0 : height; // how much of tab to show at end of anim
+            dx = 0;
+            dy =  slider == mRightSlider ? (top + viewHeight - holdOffset)
+                    : - ((viewHeight - bottom) + viewHeight - holdOffset);
+        }
+        trans1 = new TranslateAnimation(0, dx, 0, dy);
+        trans1.setDuration(ANIM_DURATION);
+        trans1.setInterpolator(new LinearInterpolator());
+        trans1.setFillAfter(true);
+        trans2 = new TranslateAnimation(0, dx, 0, dy);
+        trans2.setDuration(ANIM_DURATION);
+        trans2.setInterpolator(new LinearInterpolator());
+        trans2.setFillAfter(true);
+
+        trans1.setAnimationListener(new AnimationListener() {
+            public void onAnimationEnd(Animation animation) {
+                Animation anim;
+                if (holdAfter) {
+                    anim = new TranslateAnimation(dx, dx, dy, dy);
+                    anim.setDuration(1000); // plenty of time for transitions
+                    mAnimating = false;
+                } else {
+                    anim = new AlphaAnimation(0.5f, 1.0f);
+                    anim.setDuration(ANIM_DURATION);
+                    resetView();
+                }
+                anim.setAnimationListener(mAnimationDoneListener);
+
+                /* Animation can be the same for these since the animation just holds */
+                mLeftSlider.startAnimation(anim, anim);
+                mRightSlider.startAnimation(anim, anim);
+            }
+
+            public void onAnimationRepeat(Animation animation) {
+
+            }
+
+            public void onAnimationStart(Animation animation) {
+
+            }
+
+        });
+
+        slider.hideTarget();
+        slider.startAnimation(trans1, trans2);
+    }
+
+    private void onAnimationDone() {
+        resetView();
+        mAnimating = false;
+    }
+
+    private boolean withinView(final float x, final float y, final View view) {
+        return isHorizontal() && y > - TRACKING_MARGIN && y < TRACKING_MARGIN + view.getHeight()
+            || !isHorizontal() && x > -TRACKING_MARGIN && x < TRACKING_MARGIN + view.getWidth();
+    }
+
+    private boolean isHorizontal() {
+        return mOrientation == HORIZONTAL;
+    }
+
+    private void resetView() {
+        mLeftSlider.reset(false);
+        mRightSlider.reset(false);
+        // onLayout(true, getLeft(), getTop(), getLeft() + getWidth(), getTop() + getHeight());
+    }
+
+    @Override
+    protected void onLayout(boolean changed, int l, int t, int r, int b) {
+        if (!changed) return;
+
+        // Center the widgets in the view
+        mLeftSlider.layout(l, t, r, b, isHorizontal() ? Slider.ALIGN_LEFT : Slider.ALIGN_BOTTOM);
+        mRightSlider.layout(l, t, r, b, isHorizontal() ? Slider.ALIGN_RIGHT : Slider.ALIGN_TOP);
+    }
+
+    private void moveHandle(float x, float y) {
+        final View handle = mCurrentSlider.tab;
+        final View content = mCurrentSlider.text;
+        if (isHorizontal()) {
+            int deltaX = (int) x - handle.getLeft() - (handle.getWidth() / 2);
+            handle.offsetLeftAndRight(deltaX);
+            content.offsetLeftAndRight(deltaX);
+        } else {
+            int deltaY = (int) y - handle.getTop() - (handle.getHeight() / 2);
+            handle.offsetTopAndBottom(deltaY);
+            content.offsetTopAndBottom(deltaY);
+        }
+        invalidate(); // TODO: be more conservative about what we're invalidating
+    }
+
+    /**
+     * Sets the left handle icon to a given resource.
+     *
+     * The resource should refer to a Drawable object, or use 0 to remove
+     * the icon.
+     *
+     * @param iconId the resource ID of the icon drawable
+     * @param targetId the resource of the target drawable
+     * @param barId the resource of the bar drawable (stateful)
+     * @param tabId the resource of the
+     */
+    public void setLeftTabResources(int iconId, int targetId, int barId, int tabId) {
+        mLeftSlider.setIcon(iconId);
+        mLeftSlider.setTarget(targetId);
+        mLeftSlider.setBarBackgroundResource(barId);
+        mLeftSlider.setTabBackgroundResource(tabId);
+        mLeftSlider.updateDrawableStates();
+    }
+
+    /**
+     * Sets the left handle hint text to a given resource string.
+     *
+     * @param resId
+     */
+    public void setLeftHintText(int resId) {
+        if (isHorizontal()) {
+            mLeftSlider.setHintText(resId);
+        }
+    }
+
+    /**
+     * Sets the right handle icon to a given resource.
+     *
+     * The resource should refer to a Drawable object, or use 0 to remove
+     * the icon.
+     *
+     * @param iconId the resource ID of the icon drawable
+     * @param targetId the resource of the target drawable
+     * @param barId the resource of the bar drawable (stateful)
+     * @param tabId the resource of the
+     */
+    public void setRightTabResources(int iconId, int targetId, int barId, int tabId) {
+        mRightSlider.setIcon(iconId);
+        mRightSlider.setTarget(targetId);
+        mRightSlider.setBarBackgroundResource(barId);
+        mRightSlider.setTabBackgroundResource(tabId);
+        mRightSlider.updateDrawableStates();
+    }
+
+    /**
+     * Sets the left handle hint text to a given resource string.
+     *
+     * @param resId
+     */
+    public void setRightHintText(int resId) {
+        if (isHorizontal()) {
+            mRightSlider.setHintText(resId);
+        }
+    }
+
+    public void setHoldAfterTrigger(boolean holdLeft, boolean holdRight) {
+        mHoldLeftOnTransition = holdLeft;
+        mHoldRightOnTransition = holdRight;
+    }
+
+    /**
+     * Triggers haptic feedback.
+     */
+    private synchronized void vibrate(long duration) {
+        if (mVibrator == null) {
+            mVibrator = (android.os.Vibrator)
+                    getContext().getSystemService(Context.VIBRATOR_SERVICE);
+        }
+        mVibrator.vibrate(duration);
+    }
+
+    /**
+     * Registers a callback to be invoked when the user triggers an event.
+     *
+     * @param listener the OnDialTriggerListener to attach to this view
+     */
+    public void setOnTriggerListener(OnTriggerListener listener) {
+        mOnTriggerListener = listener;
+    }
+
+    /**
+     * Dispatches a trigger event to listener. Ignored if a listener is not set.
+     * @param whichHandle the handle that triggered the event.
+     */
+    private void dispatchTriggerEvent(int whichHandle) {
+        vibrate(VIBRATE_LONG);
+        if (mOnTriggerListener != null) {
+            mOnTriggerListener.onTrigger(this, whichHandle);
+        }
+    }
+
+    /**
+     * Sets the current grabbed state, and dispatches a grabbed state change
+     * event to our listener.
+     */
+    private void setGrabbedState(int newState) {
+        if (newState != mGrabbedState) {
+            mGrabbedState = newState;
+            if (mOnTriggerListener != null) {
+                mOnTriggerListener.onGrabbedStateChange(this, mGrabbedState);
+            }
+        }
+    }
+}

From 3f9b721a48bbb92930bafebfd6895045266594e9 Mon Sep 17 00:00:00 2001
From: Guillaume Beraudo <guillaume.beraudo@belledonne-communications.com>
Date: Tue, 11 Oct 2011 12:18:36 +0200
Subject: [PATCH 39/62] Incoming call resources for older devices.

Nexus one crashes otherwise.
---
 .../jog_tab_bar_left_end_confirm_green.9.png  | Bin 0 -> 2853 bytes
 .../jog_tab_bar_left_end_normal.9.png         | Bin 0 -> 2728 bytes
 .../jog_tab_bar_left_end_pressed.9.png        | Bin 0 -> 2634 bytes
 .../jog_tab_bar_right_end_confirm_red.9.png   | Bin 0 -> 3215 bytes
 .../jog_tab_bar_right_end_normal.9.png        | Bin 0 -> 2820 bytes
 .../jog_tab_bar_right_end_pressed.9.png       | Bin 0 -> 2989 bytes
 res/drawable/jog_tab_left_confirm_green.png   | Bin 0 -> 4455 bytes
 res/drawable/jog_tab_left_normal.png          | Bin 0 -> 3666 bytes
 res/drawable/jog_tab_left_pressed.png         | Bin 0 -> 3918 bytes
 res/drawable/jog_tab_right_confirm_red.png    | Bin 0 -> 4095 bytes
 res/drawable/jog_tab_right_normal.png         | Bin 0 -> 3416 bytes
 res/drawable/jog_tab_right_pressed.png        | Bin 0 -> 3587 bytes
 res/drawable/jog_tab_target_green.png         | Bin 0 -> 710 bytes
 res/drawable/jog_tab_target_red.png           | Bin 0 -> 728 bytes
 res/drawable/unknown_person.png               | Bin 5539 -> 2521 bytes
 res/layout/conferencing.xml                   |   8 ++++----
 16 files changed, 4 insertions(+), 4 deletions(-)
 create mode 100644 res/drawable/jog_tab_bar_left_end_confirm_green.9.png
 create mode 100644 res/drawable/jog_tab_bar_left_end_normal.9.png
 create mode 100644 res/drawable/jog_tab_bar_left_end_pressed.9.png
 create mode 100644 res/drawable/jog_tab_bar_right_end_confirm_red.9.png
 create mode 100644 res/drawable/jog_tab_bar_right_end_normal.9.png
 create mode 100644 res/drawable/jog_tab_bar_right_end_pressed.9.png
 create mode 100755 res/drawable/jog_tab_left_confirm_green.png
 create mode 100755 res/drawable/jog_tab_left_normal.png
 create mode 100755 res/drawable/jog_tab_left_pressed.png
 create mode 100644 res/drawable/jog_tab_right_confirm_red.png
 create mode 100755 res/drawable/jog_tab_right_normal.png
 create mode 100755 res/drawable/jog_tab_right_pressed.png
 create mode 100644 res/drawable/jog_tab_target_green.png
 create mode 100644 res/drawable/jog_tab_target_red.png

diff --git a/res/drawable/jog_tab_bar_left_end_confirm_green.9.png b/res/drawable/jog_tab_bar_left_end_confirm_green.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..e8be7bf370b300db4653af8e7a9adc86d4f3423d
GIT binary patch
literal 2853
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
Db<$uM

literal 0
HcmV?d00001

diff --git a/res/drawable/jog_tab_bar_left_end_normal.9.png b/res/drawable/jog_tab_bar_left_end_normal.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..747745378c7a7dd642015bdf2605cb52df8f21c5
GIT binary patch
literal 2728
zcmV;Z3Rm@sP)<h;3K|Lk000e1NJLTq0024w003SH1^@s6a^44I0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU+N=ZaPRCwC#oPSJI*%im%8y+w)3^2gJ
zLPsFw$Dk~_!L_(1XvCD&HjTfMCdU3{f|Wl={KJ1*{kwJ3P5had<q!7{V^Y#?H0@tj
zTbtIjn{BL;2oh5h*3c;8ECRy}!_2(fbH;n8hs%9-0cYmD>P>Fm8wBTl=6lY$=iYnn
z=!`LKwN2M`Z7qMl%J;-K)K~hxuC+kssIBUaUD{jH^lY16uG(9p=vxD7WFboC!=)B_
z9q)P2ec6Nr_Z&1b2<U-JyU*v_vS-hpimt9MUt3#SX?}jbUR_;Xgzuk4*35tc<kmnS
z&^0hHP`_ixj%vd&67hIE20faDHaR)@l4UUpwzs#xS<?l;@4)5#zP`ThBS(%j0Lwx+
z91bl)1IRcqn!GWV<#2DjLCBVpl9C^uKYu>Be*Jp)+}zwZkw_$pj0pJ3RTv%CbmBwK
z00qeR%gf6@9vmE85B_IPO-+RWav_mO2tZwo*&K@AQ&`=$pa8jf-MV$X=gysLEiEmL
zy?F6rc41**k*k<ejzgv4#61Vpv!SZ7M#vAFo11q7WD5kGXebm)L2@5-;lsoI5>R|C
zz^ouM0d1@SvZJ=P_Tw{W&a}e)JV4F?WE?;=8IoUh{%^XhDpl52iUL@@$K&}CKsLKv
zu6eFxf-9MZqg|yg&9!Z3x&T=Um(J6tPd9qK-bGY08jYqPDG+w>Q=O=}Oi>zy?C7K0
zPMtc{3%;pCbe)->pU1$XaX^g%TB#~W-AtS9ia|lm?%lh0_jGr6yPrRQ{tb+kF@R!1
zEzt!i1(tnOR*{aeIRypCrka|X?;ksM%nw7z%bA&(1xR*G4!|Thgw-g#G{j^z5Uo_v
zEhkT&tc6S`JUu-fiN#_`t`;LcnFf^A6sApvmW&T6D+UEMcO5=__@nyz`sCB6Ps1em
z2%prbib7RMP1>0-Q4Yv*t|&m(R8&;#I&k2C2TV5Qmyp`2{E`vC)IC>`5p!k4RGHlr
z?dtFEuK*R%WHCuMDWFi0`XrCSj07KMk=xp1_5x})Z`iP5duL~-HZd`gGFc9xQz#OQ
zn3c&&aLiVq&^`j+^g>cFGdnwrb4pV-S>mH<pXHEDf@HZ|eKcO9W+TkZJDZxC;^X7v
zQB3iq#6UnXVzxT*N$tNbxpWG~a<InwIz_kb+qbU>$4m%7sHRBqm=z@POECv!WQ=6F
zTthZ2)b!QW)qSt6tu3V{A2TVCCi!F9KLuni{ZYZgtQ6hS+uK|C5*k<2B!KBaLqM5$
zO-(jiS<k8z1$tLrUf!O~n>U-l31Y@fVV)F5impOU5oj#OOFNlvV@F3vKCT#`nmjpB
zLdq(NtcL_2+idKpKs&c?-D+Uc9*IPf0GftS!AYRDgtP+f2nK@*m}`niyG%6&Fq5WU
zw%ejJB>${~anlbz8i5IQ0?n4L-l^0RX`UQi?Y12$E7}A@N**TeknSZ#f}omxNXwUu
z1|B=^xyqoy=H_MwYQ}}xt^_jEi_mWpw88K9FG4ny5Yd)Sl&zvGfwiT7E&&Dq^p=;G
zR~Ho(&0(~a%~qs1WL~M$Ni?&0jQ~}&HV_E705UF;1bNv*aqkF78MLahvQmdxN>XLE
zBtchQZR?vV(3+~MDn?U28bPJ23eqvATUK0L%y6kh0%cMnV0G^p(=Bzo-AM(gyevsq
z@RqC^I0e*OP*7lkk1`5skpQUt(lMs%hSZOVKtw?ml#YP20yS^~jk6Upx77Y$O6Uw+
zW{_$O7|D8+$~h6<kQT2Pf^+z91ExFCbYl>4y}a;OblnQhDZ`2iGy)M9*NZd)tAb?N
z-tv1BjaGNgLY`|t(_AhW<FF=CmkINh=AF!G2?K7^8`ag-x=>Wq%=0Tv^QaR$B0Hjr
zKA)bR&d2IYP*fwZOj30T6mv)jriwlbg+h=V6(HymMfrS{sw+p`Rh?YOm7)`qlamF7
zg@vhrL|_>;Wl2@XC~J@hodFQs(JqF7G=rdGE~>vGOy{@K*%KxyYkNhpJqA_1FpF^s
zKUH;=qD~rKunmuokC%Boo;)085K0U+D5?akiB8PgF`y$)o;)dmCdN}0+!DWa0;C*u
z(Fw=lp&@UGltA<iLrTcRBAF_`6@bE5bs?_}*N{}_UcP$t=uu5^adDo=l4!T`TdFEC
zX<LKd8W|b!mz9;}<CrRj8Uab}g=sJALQU1b<)SY$UEW3~CMHUv(P%l0sZreRPA~hx
zABmlB{1Hyj5muDr{EyWLdnx*A^V%G`ckf<31|>)dHC$prAl|7drvnyMntqb}KBvvf
zbg}(zczF0dFkiRGlsGICR|(q6Y|`&#N7F@BC*c?FKX~w<ArJ_RCK8Dx?yhmu)yOa-
z3XRh>3-W%A^#AI13Pz&+=FXiv-}U)?g{Ue<V4`g5Ds@eY$~0K%Jax>8qWA$DuUXRk
z2mI2%#>U1P>+0&p&~dq{so4!zHl6p1oL8t$@??3|quWhUY`?vI`*sjibrV(D>pJ&i
zjRY!s)otaYMAbjTFYbj1+|t_G`aq~Eh80mFhpO`8$CTpubE2#+W<Ww&%}zy+qz&D?
zdGnKv8#jIpkT2nNk{=jIe_|Y1z@=*ig}F*402%?d4=6m;m+(-3x_<rohX)TH{0knH
z<T)^{1!S*;G+k6>2~=0?wc1KiY`?sJ|NdZmdwUbKN8xZd&g%oyplHe*-o(kQ_#jl(
zW%A-$HZrJh1qu(b2<m)s?b@}Uoj7q~3KIShq=<~yA*D;^L^MW7xEBg54-k-XmDx#A
ze5l_8><3q`UftH;-~R{v5tg^o>T3Z?AVtNtiyS1Nrwy0w24qUvl^)qT{rK_YU){QO
z>w})2o_}KD6*)}61TYRS_(S**TwG0)o@Nq0n$2?86@kLT#6i{1Z``=?d1Yl~c+;j$
zW4!pvl<Rg;X#h5*BU`%S5T34BE6%y1_z=SY`-`EWp`Sw{5p8H__!>)g@R&0N#pHpU
zGNh1}M=NckC~02+nE&$S%SVnMKYjz$oy0@3GOS$N%L|xw>72JMeN-cp@XtWW@{1QQ
z?i&~wxas%%Q?PtkNmrQBI(u=zfR^rL>-7Grk3J&<z<xSAJL@`o_UwL$#D8pTZ2UKe
zHRWR=ssc$>`D>;E)0z&m^WgL;1f<x73m1NJ^ytyskW`Gru!Cltq%{Ka0X*qUj10$Y
z1<D^V2C(M=E_&(GrDKN<9s2vuojV`GYplmll5f#ivZtyrS!Tyzq{^H=1F-2USFZeE
zbaZrAUtizfJRVP&!<tO00%7XnC3}PNhfDzMui^II-Me>x`taeyA8+5jeRS{My(3<)
zcRn@cu_$@TM$5<;2EgyZr3-pbK|#T;mX?-h;JeR)!QfO`Sy>b&2D90O-M@eTCm9>8
z`4=_?pf^I_1bqYa2I%-bM^)KW6Byevo|OQw_(m%1CEQ)ySqA;<yKj+u2l@`w-pz2r
iLz23QRp-S25nuq`7dhwu5F>^F0000<MNUMnLSTaP+#KQn

literal 0
HcmV?d00001

diff --git a/res/drawable/jog_tab_bar_left_end_pressed.9.png b/res/drawable/jog_tab_bar_left_end_pressed.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..c79a35cf3da8281ad686969945f900bffc68a6dd
GIT binary patch
literal 2634
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

literal 0
HcmV?d00001

diff --git a/res/drawable/jog_tab_bar_right_end_confirm_red.9.png b/res/drawable/jog_tab_bar_right_end_confirm_red.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..0242a42b5b2b2d8b1249d8a667c67cde93e6a8fa
GIT binary patch
literal 3215
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

literal 0
HcmV?d00001

diff --git a/res/drawable/jog_tab_bar_right_end_normal.9.png b/res/drawable/jog_tab_bar_right_end_normal.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..2e6ca2ebf201e46e2049ce8dd56e657ccd6e27e9
GIT binary patch
literal 2820
zcmV+f3;XnmP)<h;3K|Lk000e1NJLTq0024w003SH1^@s6a^44I0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU+rb$FWRCwC#oLg)Z*BQrW_TtO>wwO3L
z6oG?DaG`D`J820OL=_5Bg(`SQJb{pSfyX>RA1cu_50+5nA}EpkR7)VzB1J-Og^Y^e
zp$N)F*uf5Viji>vU)Q_7?0P-Z|2H|`^vv;W@NITyL`FKAnX@yy^PB(oedjx8&a7^l
zrna0#*L6BkU+($&UP3E4SJwixgtRwgi7fZTpqT6%r|6qyx`?1h^ZdKxDDx;oqWl-G
zFy}dFS6A1^d4$woy?Qk>H#cYY^z=;LzI}VVqoZRCH~S7g>jv<YCqGI-rL(iMC2y2i
zLZMKYmgsj&aW<Qc+_-V$RcmYOv%$f^+qkBGd7|j(=x8#}pj3!9M5IMncJ10#xqJ8S
z58B$=YH&yu85)3}ud1T$?d`ww7*5?brEQ&n!5WRlVx<)o6_t-4Kb}2){CICFmAZ=S
zd$MYZW-^(uM~tQl$)M7<Ha|aa;2JWsv$I*0xy_q5S3=pJ96fq8jAQ-**sj$A4SB7m
z$c-7+1{K@1SitbtSzM1%U0rR#o;Y!$2%i-L_TRn(l~q(>c^fWj%Ftq8Hw?oBa0X>E
z9*<X^KYzXfu%s-x+1(X^BGiXHRMb>V*9HU}uT2r8SY3jh6R_r)GiTn18PjKJz&=`u
zqPmw+Rt`c8B7@Od6wM75W~>2r%i+U^e}noYV4wQcN6r89+CFKDW`<2yL-f^TSXxg{
zPiFy^T)TE{sHLUl-DAg&HRGc()J-nObUp1`N<PX8v)MA3RiK^>Y@0UxHiL5}>+0&_
zr%s*PbNcjY%AWr27f?rA>0-W`3d@R8K$33&?I)ATG|o*Rv8dj+Z{HrAHw9I1E(sJN
z-4h{m1SE&~%Alku!D6kms#u%iGh=dcau)lEBS((Bb@%SwPjK!KVEYRVnzN~qnix%1
zS5^~ig4V@8*UgWQk540OjGR1q@*QMPAL45k4~o0x`EY>*Y$po@!`l)lsY!lmeXjT{
z)n}2Lr#5cf7(I08&`z8?3{^V|4yr1eBTKS_6GO7P1j+lN804>!NMv&V{{7WguU;j8
zr4GQ$*N!mI7kX9bCd$RFj(ijDV{IcaTCPNew#B|F7fKN)CMIUEq|n?{1K}5oQq-VZ
zmcMSAYa1(?5z9PjVZWqp;jgx;;@Iri*jTEmsi|b!wr#sn_cadfE104=inUNARTXA6
zSv^*mMkKh1dWyms`0M1sg9j^s@sY0-b@5wMP5PyFlmn0{2PBa>v8prm_4Tps+qXBN
z?q;s^uppp0%-ED+*<=|^n6oB<aw3r#85v0(IB+1|-QB$tU*SK{T);vtO#oWZvfoPG
zI#aZ*GYt(5W$V|k|2gV9aOk)i<qPGb3nH`Rx2n%N3j3(EPt8pRQ8=}C@7`kIe3&yB
znLb!ZL1|Z$Zh+PNaG~SmeJbg6nwpz*b91u+U;Z_9e0&Sau&lB$S&cI!8IZSmP0Et0
zNFrt$8yllQs&n;G(`QeN=z63vB}X@pZvby|Dv5sUd?JyU-LYdw`GW@!nsE5Hz6Vu+
zISSj|IvJYtWb$2VSGR86N<EZDlrP<)u5UmYL_nCl=Jr$t<bC>VYHBK5TU$Gec9jOf
z*Q0*Ow~8`^3@gM~FjUINazXApPYFMonu`AZ{(A8M%K_>)leIG@hE;rafe%w5^M$H&
zTefVWFW8E5Gblc4D=Pb|Tj679Fs-JhhQ^pS1tu7&QCNw{rZVVe-583#rKP2rcs%|#
z>MCdiF%Y0qQ{w8I>hKID4}hK9uwg?8NyIy-O8VAE-9{57aUIcE1*PPHf)dP^D&9u<
zCUB;!KrToe#ITSi9#RogO`v?#MN#{jl_vpq?i-86s7F@i>*mGHbd~m14o;3lgFvZA
zgMdV!@jxo-1}LY4yij{uQc^;oWkEGvhq6k7VJ{SrXxJ2+B|$RXT$z*W2nD5zG?*sx
zcY6w8NJOzfEy8c@!d*9c*o9-24N7JoBr)B_31ny<bCT+V>7(*9oE$g8dP*lAZl?q1
zqf&DJeXyo@enV|3fzCR{i~?e=ax1gIPbm&@2R#yrXy~qyh!cS_UCw?aHBGmHZ$1{F
zI`Z8JC-gy4R29OMmF57%YZ_iDDk{>(#>Qwga5xY?s;Vb}$@#5AQ8HbChDJt4im>}U
z5Q@4eY05!IZceoCX1Z7pql$}*LoZ*xB+x;JqB%mf?-F|+S&(2&sm?N65r|4tsni7S
zQzB44sw&DV%4)KIBAE{j4GmSI&N2Pf*P!Z@S9#8ZGN;hmCpF8;%EAK!1Jn<FxL|NB
z2(Yq0%8>FtftHt-N1i=<R*vJl-9Y`6@0x1nlVga}0Zu^((N>?Ho-Tj!;>EQ3<U8U+
z^&I;ukThM#u}?`tEEWs*_4Td8sSD=yM%;d&@Vxp0CDkY0GOS1v^s1_==%YuEXh7_b
zuAqKXQy#D7={5}J0<3Y{iL@_1I5<fD`E@Qu3oWUs0xD)|!^tXgT{IfiDG1%WcW<L%
z7?<dovR_SCR}*t(j-U;vz*=>rCd{_v;lqcuIQ=WPA1G+lm8ZAnh^~$)=qe<wNlj`y
zySlnIB@&4Tx#k2GT2WmcfL8rc29&0y+Y^^b%{6P*6koh}aWhW;ZH}B-FQkt;o`%Va
zDn6<4<YX0=)$Hl%sY4Rq2cSE-eym`M^4$6ykPa0EsKazQ(n8IW_V#vq==<6C{a)S`
zRr-*+l*^iG(2?i=v8sGCIMUv~fB!wGNv~u6^R=LKVj<d0^$E6{PpWE)I=!^CG>o1~
z#kFhKevGgB^mV_PcTkrm#8d*13}>jIoYThR@uDkNt~4i;$?J=G-_&zZw**}_SH)x*
z(olfyNy#wT5KK0T0920zA%*Yy!(y((0!2b>=2^`Jpsb(_D67edJDDuLVhz;%0PD}8
zW@gc#;>nYzJrT|M&Zw!pglEXGE`Djf8iFVrhRGJ6J9lm;x??n5^{d5Rj|B>IFuhh$
z9rIB$9HF40s>>!zBYQB}qU+bM|E#~izn9cp%5^ZP;jx;oW~=0^4s(^?g(1I0Vh}|x
z`+i49$4~J!hnM<y1{Nqx!pK8&Vyf?ts*rLU%G>bE5IWS+fq{Wdmo8oU2!NlV++XT7
zSfDTq!)qUvCP2w=06VfE#cwT0w3X4((b08nZEYWCv)M0j{$H1KJ)SD+GFRTQEq9(3
zaC&V^C&=O9;dN)vp8W*D=WjUm&&z#I#Gs~E0mv;AQel;S>+cE(^6As3KSG4vGc`4J
z1&6e_b*PsFDrRtao(bg`tCce)9p)OwjgNMBch_CGaN$?!bowv&_)jbSFBQ*0-Ave}
z&ic0v0a?`9*|`mYX9s-pJU;$nu}Q&Vf|2Pppo<yX3z;hYcS<IcDQ|6U{Uv%Nqd4UE
zC|?3{RbFnjK+#6!bu>_c3?nfwyL|a_<E>k_8W41-yG2TVvl5?l1w~p_kxxiuHkFA)
zqO`ZSw+6mg`{c=!TBvyqAGf320pN>O|6TF8yeH2C3?nG?=KX*egQW*T|3P`~)gL%9
z=&n42(rgj(J?duBdt~Fdj(JZlDQMH<mb?7$FLFPC26S0c`>E!z_Rv89CQklOfB^s<
WL*1v6rPgWy0000<MNUMnLSTY4i(D=M

literal 0
HcmV?d00001

diff --git a/res/drawable/jog_tab_bar_right_end_pressed.9.png b/res/drawable/jog_tab_bar_right_end_pressed.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..8bdfd8406089e98f940a91e552bf11837e3cf665
GIT binary patch
literal 2989
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
U%rv9kVf6>vi?|bLz(-{M2QdZgYXATM

literal 0
HcmV?d00001

diff --git a/res/drawable/jog_tab_left_confirm_green.png b/res/drawable/jog_tab_left_confirm_green.png
new file mode 100755
index 0000000000000000000000000000000000000000..829b1462d228a6feb224ec9456d9898f4f5147e9
GIT binary patch
literal 4455
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

literal 0
HcmV?d00001

diff --git a/res/drawable/jog_tab_left_normal.png b/res/drawable/jog_tab_left_normal.png
new file mode 100755
index 0000000000000000000000000000000000000000..eb91e97eae2cdbbf002c7fce8122a0990d016ded
GIT binary patch
literal 3666
zcmbVPc|25m8$W}otaU3wWEv5|ESO=k&rp*!p=nVw#xO&(7-QevC|NVs;=LnnBMDI<
z(I&1vv?!4>_AOky-f?f;_x<C3-ap>w^Ev1Dd(L^D@3a5T=fpeOACi_(lmGxg8h;q)
zBwWu4uhUyL3GWF?jzr<2z_B85jxjwsfh0Bsu<&5IQy_Rc$&2DdA$bJ*Hd2fMK-81w
zOyCggY%ydeU6-^WqZ>qL3AF*h*er-eBKuG{5O<0fjbQ?vs;-4XXdWie;|6wcI~JBg
zr5z4oQ;vn$JCj3v$VMJeGgF9h5Jm_<r*KG+Ao@9mA125I`X??%xZijTgF^lk;rN(9
z|8k08=Lo?v*%XL@E?kEUN5LT|gf2o)AB{$9Ly&L;90o_i5J(*a8l#8Az~PV|1Ql9i
zdw61;aMnL;2{{uemBV3SV6eczK;1w+T_)QLhA=WR+Q2{}b%YW+e!&b5DM*Lmr}`5C
zNAV-GX)F$n$$)GilH8g8922O})4xKXv+V5t24?vENR%*Tupkl(hR}t>==6=a{*?CP
zI8pxN#y?8?IR~>SFei#1)1OTi*27cvr?N12|J%@ppwJtP1Dhr+3h5k<N%p5x7#uv#
z1S))^>p}CtSX-g35eT$C9F2sd3=s$;EY=8%Lt|0a)@VZ{67dt`pLF$5SYgTyEiJ8Z
zSOfxRZ7F0eaMl($9L^Gl(?k8##WVakBnFxC(=JVD_lK^<|J21`*%T6o$#!Nk&;9HG
zM=F!U^rJFa5bQAnh#iScV{Gsn<@qaG9ED8_pm<obnRLjX`Nh!w!9LOg4!6{^wA8cu
zD{ez0ODt9&ZfS@>8{%+SB=m=_$N!Tvn9v#6MsxgEv;2G{?7)rf->olX{vI9*LpU*P
z;b`RVCFB8sL<}Bh;T+U6o_C75`<3h~FSWEZwT?1w51eRW?PDfiC{6IEzl~e#*WW6W
zdh7Am3XNsyD-NAdT3^pwIqJ!s(lM4XN!R!pi)n_b8g&)A>HY}Kc=Sw}$@lppjACnA
zHI{8uJpkHdvpwBVuht~X=zi!M_eAOYi<f$zdaaF>PxR)AReVK&JSC^-BYHNV7L>0!
zfC`Z^k7qgG{S4|d3<6MceiPo{+Z_WHIu`mOd!lZn?A3O;WAiFb#J%q+=pA4FxqI4!
zAkg+xb~8CrZIinUfzY9BYL=8uTvuUb-!B#m;N1ECr@wmna)@&Hf({K8B_)sEHi_70
z-`d+#YlKu@U0q#MT3V_Z&6hajaz|5t>f*g>*5?=)3wHKNm*g02ThgQYxfj}a`juMG
z9Xob(0y*}#`czqqk3@JkoHVi9cHy545oOL7d@M{8bc4Tp?%2`<)4z-8eH=WCPmFFn
zw8d{X@AI!XX!P5l6S{H<eFApnt+s!eoZ1F)Ij{bV`&4<;{t4cQceekR`lNRvv!dx}
z$?3QY7nE6I+oqaUR#sB7va)LTbyl{LGHw(|e9X@|2c`o>34nMmILJ_)i%+l>kdaxD
zsw^KR*LW3|ejI&v&PSAJ61ABwYG}TrZY`tkE}N<bI%D<CcL2!~zoJ``4^o`M-+4P0
zP;s)NX|T-h$z6+^>_0}k@6<l=AA56XE`w`40=J;&_K16{j?)>ar$cfr15riAMbB@O
z-vACita4+(*!4~~QT<STef_7}$nWbJLv6oBE-%lI$^H@W>Ur!JRK0=S>BoWEqSBr1
zhR7sTjcMTE?->rBo}Lkce46Ho&Z>NhC{eNha3@iHcbC&pYu*Z2C&~01sAY7M{+JNQ
zVYB?4=ngSeA<5~~shEW=P6y7-n5Jnxt_0y-Bvww{EbE~YtzG+%Yh_3jG_qGE%~n!m
zQsrJ|6O@kecNR4Izd6<W8kK!`(QvuetTKG%!P;;~L7$}gNrM_5mX&&W8vs4_Rf%G#
zl`rm}9ChUKr@gqS-O9@T$!^nh`^e$QwYk>3gL1SUucF{SJA0g-GV5|XJojm6XlU#C
zhsa$KU|xqrY)nD;&iPUfrX?ui=t0Qm_TskI)?%2pc3A6`hwQI9iU%~xacFg3mWZRU
zk|xqnK!)z_{tR?$CGwnU4wuVSIrBJZ#zmdGbcMgrU2a!UdKB9HslMLYfz%k&_l!C4
z@L(cjg3srleJwsMx(9JBDMY*QZi8skAbY&!Dmqzn{KC>pX2I4xF=&_5+hVsB+0f9I
zM0r6%d-)qure;#By^oKNq*3*g1#r0e+4ft!$b|7<wgyCSmc9+{j)|+}-yyl_=+$4?
zd#Pz?*8T<M67h9lKtMk?SIwfmE>1*oW&Hhpm3zg-PatQt)i2yhb4bX<i)q^?R%asl
z`3}Romv8@)^h`hbbQNc0C?@X4&XaP=#Oy7LlH3B9Iq7gIiI#b<FJHa{Y68I*u-vt5
z*%#U}^D9!Q7O4ln7xM0HITDkY;<c1dnbH*5ifCd+v|H@p4R)<4?3|dK^aexPkuo;6
z5<Z}@1jn6%^4szDwfPxhp&U=o`q<3ZZrpjbBQKb*a}?iS*IQ0jx*lqf*#<T!AJ?i`
zyXCRH!#kqWIlKdY{i>})e1&KfLaYmUFvqslaT?JWO<O8$kA7;5>)2UnOHQ>-y!zmZ
zkYtICbv;*Klx)5f=9XSzv!|(%yFXkM`y$)^R-`SncCI0)B;Y1uZVevjpd}Mix(F7W
z%yQQ9@4!BfTU{)5d`t3$$7*#B2d*;8gVtA<Xqv;*^zGPr(!2hIt6~aVNf|Wda7nY+
zO>T;wTTF8N)t7;41b6!mq=@{Ry=(9KBveP|{pj&L3TlC@<wtFOW|Z8cmfSLxK>(U}
zeJl%Dk{QFsZ|}X6HJ~B?A%4exnZDmJ{@#XJP2DxC1nA|(e35iYE<W*21GzeMVN#wK
z4Ej?1G}hqjF4y5Y+Yh<p0`*%OUkkL&pO?N&Z%}W~?Mgpb^5~LxSd{<Nry5^b{jdeM
zG@bzNO!VE=Ex&*N{tJNJeE1X5mKbk>#?b*^kRbV((!C=qm=mAQUn5mznIFPClbeTT
zlPW7KV@6kmV{s7aM~*UDX1rXmcIbXbrF)9XB^ORjjgOzZFR*#=!BUd092ZMDjSUU%
zkUBg&J8ShX?Gj@s?(XYD`80XPOuW!@QSFn4=pO3zumfo@YCgzDo%?DN;Q-;ZXjaZb
zp7tLAAw{i$@{!TF?`Cl$H94;GVR1d8e~bI%%-WF~BGR)(TfD?dcwX+#`)&^cCEgWP
zFS{}vS`hK6_EY;&M`M!3V;h7ge`L;rTaJJ#&k#wudhvsnX>>-}d+n%h<K}BdbpxAp
zh6#_1&VNr!@IYm^eY4INeV)|kdznWDl{oR|()r9$y#qyNs}>TpFFcAowp~f{_och{
z?!khn**WSRCVB-*1GCFdF@ot2?xopYEmpsU9}gXqgy-f|&BJZC<w3OpSKX{y(xC(*
z$^~YyJ=@3Wn!KP|Ek(b)EVt1^aKg`@;rBeGJE!Nar5kC>av@nEs08t9{cQe<`75PA
zl;xWx80r^e%&;mQ$MaeUMK!Lju1|<9{?P^CX1fWVOk87oJ9_Tu{^*wQx5nVz??}1_
znn}E>W7gxns;@4JBRY()IbdR4_Dw8r_9=d>-1|%ms?SAXI<jO)`HXHA@PyM6Ob$<+
z6w5OW@3|OjupIS-!xnk}pk`J0b%?xQP%+`6Ak$~s{3ty1ZKY~heeW{qEOh^R#08KG
z&DVDZJy+Hc&EJFDwt5{ET;nHbRv2Qel}vub32JsrhM4#D^eiVX*St(NHL>)WkQFBm
zoTP_^edNpc9AE*leZ%$h+$by4u{PnM<?tv#_Qo)rrJ<rpoD7lfZ)c6jYsC%R4h8G1
ztB8m%@)?scvtgf)=h$wVkLYz8*6JHv(c&K#;TGTn(~eq$`dN{gp)Cc4QdOZZFcOg;
z5(a;j9DA9t>$fsN)qG*Ib(ld>x1zW}d$^dHLaN-Vs3FmFBcmH`T9k5a+W2#y8Uef)
zxwF$zrf6hjBzccMd|SBYAiL76{p8qL5e=h6v$U8|u{Qu=vn8mlXLNLwIlHua2`IeX
zKvjyH&U>Z^barW7avI9a%v|4RuBBO~VCOJ0b_7L*e_s!mwYq+ma{qm8sw+6+x;whu
z2hf(k-6o#?25VCd_5q4&MpoJc0>Lh^BV(m?y<!G{02E(75?o3MD=RDemhC^?KXIl`
z5l}Us4>7Sx%@lStG^b`Nd%a*H)LkTHcZt(o*QTm06=$sssXg~BSeew)YWz*cvFz0=
zK*4AS?(pxYVnf86X82vE7Zvs)O0~>n9m0UC@4V?J-7c;^o*WrfydBV1_c0y;SGOyc
zYLPsX$5-ikbIdWq&RsX|X1h(32lWi#^6);&*nW!~s>DRjfwsBD6_^QWp!R>0su6Qd
zL=*+|p94cY756C+a$X+)ihpPVDdfqYfJh!4m_~r)=I*ciS6QVmnt?U}MtrjfEA}_#
PjlVp+l|8Q5k{I)EkNswE

literal 0
HcmV?d00001

diff --git a/res/drawable/jog_tab_left_pressed.png b/res/drawable/jog_tab_left_pressed.png
new file mode 100755
index 0000000000000000000000000000000000000000..99519929279f10989ab59bc396a26fcea9f8b6fd
GIT binary patch
literal 3918
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
S>A1B&Tx*NN#4^11>Hh&-J>M1p

literal 0
HcmV?d00001

diff --git a/res/drawable/jog_tab_right_confirm_red.png b/res/drawable/jog_tab_right_confirm_red.png
new file mode 100644
index 0000000000000000000000000000000000000000..2e1e105c69ead7d638788e2142933c46a9ef72c4
GIT binary patch
literal 4095
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

literal 0
HcmV?d00001

diff --git a/res/drawable/jog_tab_right_normal.png b/res/drawable/jog_tab_right_normal.png
new file mode 100755
index 0000000000000000000000000000000000000000..f2113f26e1cddaffee1c8a45fecacb1b1c29dbe7
GIT binary patch
literal 3416
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

literal 0
HcmV?d00001

diff --git a/res/drawable/jog_tab_right_pressed.png b/res/drawable/jog_tab_right_pressed.png
new file mode 100755
index 0000000000000000000000000000000000000000..65cd51ea6d14c29692900d892272df67879f4e95
GIT binary patch
literal 3587
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
BEYtu1

literal 0
HcmV?d00001

diff --git a/res/drawable/jog_tab_target_green.png b/res/drawable/jog_tab_target_green.png
new file mode 100644
index 0000000000000000000000000000000000000000..188f3cc838c46fde6972cf77339fe96c4aee03ff
GIT binary patch
literal 710
zcmV;%0y+JOP)<h;3K|Lk000e1NJLTq000mG003MF1^@s6XK6Kd0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!Xh}ptRCwC#mrZCBK@@=BHnV?mm82G9
zEuu9lM2mvn^rUAG9z1vv3OOry5OVV1DPW=CJ<^kidQcPz5{d_@7BOwD+JdIW9*j-f
zY{=$k|Hn7!Msi4cDPGFF<%69!^FG*_H-{A{rLdD2fE@-GZ~+%^0T*xq7jOX={D%;F
z<YeS5avX^Txi#bmvVd6I3C^ow<;v~U_=Uuo(Nlv%`wp>WWux|c>GRKTlj*6MR?~ci
zsZYHG=MrP_Wa?h>nxer0%Wi<{+3g7ul0cUBfLVuf`fldg(w9O8)A??JOh_pGVCv3w
zS#u87TUBse3w-Kr?X(aAk;tH_5wPmwpIhViAG@xXVxJQV1ecOGuihAmhZB0O1Wl_3
zE($!)X~W(vrv;YX1T`#cvDh%p&n~ZE-3kc=7f+myova#VXqq*k)bF|Dj$`AT0BkL*
zL2@0zF;VrRx?zCru<xe*4~-fS(X<E-j<)wFm?5@f`o8ZDQ1JT-1blqzf^A!Vr?w*~
zRn{AZ8X-|Cu#NNkHZCCqs+)~^&>R0+d3x^sud<?qL6RgOq8LB|w#ICZt(l))UB{ZY
z-GXfH<y^J8<{K(Dfg*)L7G;n`r44&$IX1`Eym^t=vF0@^>>MNhxX}9ihvL|g(Gh9*
z@P3tqNV|bVf-o5h3X8g)nar)4EqelM7P|#3zS_3C`SIO%uTrw3suZP~Iw*LS>=u`6
zM)v7K`T3)ntYtb6aqW|ScY$qc9J$QyMdzq6ib4NRBL&3W?l!WBB16dDU~C{8hz`3i
s1ped61zf-dT)+ifzy-Tc@K=BV03K%RcoitXX#fBK07*qoM6N<$f+_7sUjP6A

literal 0
HcmV?d00001

diff --git a/res/drawable/jog_tab_target_red.png b/res/drawable/jog_tab_target_red.png
new file mode 100644
index 0000000000000000000000000000000000000000..a36394dc51589b133ec1bc2db167e104ae000d59
GIT binary patch
literal 728
zcmV;}0w?{6P)<h;3K|Lk000e1NJLTq000mG003MF1^@s6XK6Kd0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!dPzh<RCwC#m(NcVK@`W|?(A+`whOee
zR4_zDLL!n7^rW6N@uoLTPb5bF1dV6B^9OLjXuJsFXbcA>#TXM31;Jo~k%BEke}IK<
zx9sonO=%69!i9Jt^OA3}^Y(o|vpe%9*%c_IaGVg~n85)YzyTb<0UW>q9KZqpA%q6G
z0BQi$gNoO3In;O50?IlHaJeZEyfvH{x;of-uCGniI#@Dq=o|By)vv?jFFsT(^A)B(
zH3D23=<0qjlDK!L#iebIUIyQ?_ZKRlfUJdKR}%7%#-B|ttfj^<J;&~m`eRFkJRD8j
zzZ?Fg$Bpy`Sh+2*wu@jFcfr{yfsG1yRK3#I-#IxyOMFU`==17;>yK~V9=b>a7mUnL
zG?l<JP4I1}D$lgQHTJ+U3<yg~INs4t->)pE(3g^GfNO&-v0h^{SDlIae!~@aZ5yZ{
zz~JdvFY}<@)B)X^=|(Cg9b5|+`LGXgH2YYiwrZ_7>SC!nKypme2geZwHhUHD?*`E-
z02~)wR$KGd0h?K~qQ{985k(K6;VYn76oC)|S!=Ic>y1CHJe@3L@`11lGH#h9%OFeA
zU#jNto`N;+3hM>*Bo6|nCcZ81WMrx<%^E0b6G)*DNWtK~@S5cmO#@c*a(SVMp4SKa
z0DoL)c_y3g?`c1yoNbPVh%5n7WFR;z2_ZyP;iFS3KAD?IR~&l;Jzow2SS(qdyZv^3
z#rq+85fY11B^DLRTFCwE8v66qrTp09?3C#`PqB95u(QAx^*rhZI~Vn>!dR>I|1@fa
zwZu`UkwpY`3Z>P?I%*45gp(Hn|MBDi4&VR|-~bNbfRhLKEx-UkO7&wi3N&v30000<
KMNUMnLSTZv0z$I@

literal 0
HcmV?d00001

diff --git a/res/drawable/unknown_person.png b/res/drawable/unknown_person.png
index d665151871b05cf3e4f34a3e378f93e9bf272e36..ed45aedcdc9139fbf4befb7af9131d5c31375fef 100644
GIT binary patch
delta 2484
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

delta 5525
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
XkNp@oFaZc=00000NkvXXu0mjffk~=H

diff --git a/res/layout/conferencing.xml b/res/layout/conferencing.xml
index 175a8c470..d6537d0ba 100644
--- a/res/layout/conferencing.xml
+++ b/res/layout/conferencing.xml
@@ -60,14 +60,14 @@
 			android:text="@string/show_send_dtmfs_button" android:drawableTop="@drawable/numpad_big" />
 	</LinearLayout>
 
-	<FrameLayout android:id="@+id/incall_picture_box" android:layout_above="@id/conf_terminate_row"
+	<FrameLayout android:id="@+id/incall_picture_box" 
 			android:layout_height="wrap_content" android:layout_width="wrap_content"
-			android:layout_centerInParent="true">
+			android:layout_centerInParent="true" android:paddingBottom="30sp">
 		<ImageView android:id="@+id/incall_picture" android:visibility="gone"
 			android:layout_height="wrap_content" android:layout_width="wrap_content" 
 			android:layout_gravity="center" android:scaleType="fitCenter"
-			android:padding="10sp" android:minWidth="192px" android:minHeight="192px"
-			android:paddingBottom="50sp" />
+			android:minWidth="192px" android:minHeight="192px"
+			/>
 	</FrameLayout>
 
      <ListView android:id="@android:id/list"

From df8093eb939cc2caf115254dde4f20bf24e5e8bd Mon Sep 17 00:00:00 2001
From: Guillaume Beraudo <guillaume.beraudo@belledonne-communications.com>
Date: Tue, 11 Oct 2011 14:28:42 +0200
Subject: [PATCH 40/62] Enhanced uri picker activity (image buttons)

---
 AndroidManifest.xml                     |   4 +++-
 res/drawable/picker_plus.png            | Bin 0 -> 426 bytes
 res/drawable/picker_transfer.png        | Bin 0 -> 1852 bytes
 res/layout/simplified_dialer.xml        |   3 ++-
 src/org/linphone/UriPickerActivity.java |   3 +++
 5 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 res/drawable/picker_plus.png
 create mode 100644 res/drawable/picker_transfer.png

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 5efc5929c..79173267c 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -44,7 +44,9 @@
             </intent-filter>
          </activity>
 
-        <activity android:name="org.linphone.UriPickerActivity" android:theme="@android:style/Theme.NoTitleBar">
+        <activity android:name="org.linphone.UriPickerActivity"
+        	android:theme="@android:style/Theme.NoTitleBar"
+        	android:screenOrientation="portrait">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
             </intent-filter>
diff --git a/res/drawable/picker_plus.png b/res/drawable/picker_plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..e75c7c27c42d18a9ed567a1fa36b8a00b45e0d3f
GIT binary patch
literal 426
zcmeAS@N?(olHy`uVBq!ia0vp^nn0|=!3HEn{t0UUDaPU;cPEB*=VV?2Ic!PZ?k)`f
zL2$v|<&%LToCO|{#X#-XL734=V|E2lkiEpy*OmP?7dJPT;MQsXN`a<mdAc};L>zuQ
z-QLUDQJ{T)EvM73T20%g+yl36O|D=lX3l@;_=d%C!khzIp<S{~t%@46HlEO~nK6SW
z|MMrN&&_Ma+Vac(>FtQQ8<dgf)WC6q<HxU3!`S#^>we6dr=aOkI;m+-xSvT~M_t?W
zJ*;~F**w^@AKZ}GbmBwLY2BG24D&4?h0Jk!XtBiED#h+Z%Epg#*<E$c+AyjrtUqu&
z@3GaN^j+T^=QZBrQ#S6n-gZ+r{eX<bmN|UM9p%+d%d|Q8b(ha=V$(Q0&r<S>#qEd<
zB7O5*O52qSRtOr|FmWeb{q)J!EM)suRzsF^+wZJxn7&N+#GMFpi_+lxr?Q_PPB^}6
zX7oSRh11m^E!CIcdpRMtc}}Rav$@X%&-NN$@vr}8h+Nvc_qkk1)9I<6_Le~rsX69?
RcYp!O;OXk;vd$@?2>|_es-6G<

literal 0
HcmV?d00001

diff --git a/res/drawable/picker_transfer.png b/res/drawable/picker_transfer.png
new file mode 100644
index 0000000000000000000000000000000000000000..0251581f3c70e7838854757fddf9beb7436e6007
GIT binary patch
literal 1852
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

literal 0
HcmV?d00001

diff --git a/res/layout/simplified_dialer.xml b/res/layout/simplified_dialer.xml
index 1ffee31fa..9c6632fcc 100644
--- a/res/layout/simplified_dialer.xml
+++ b/res/layout/simplified_dialer.xml
@@ -26,10 +26,11 @@
 	<LinearLayout android:gravity="bottom"
 		android:layout_height="wrap_content" android:layout_width="fill_parent">
 		<Button android:id="@+id/AddCallButton" android:text="@string/AddCallButtonText"
+			android:gravity="bottom|center_horizontal"
 			android:layout_height="fill_parent" android:layout_width="fill_parent"
 			android:layout_weight="1" android:background="@drawable/clavier_bg" />
 		<Button android:id="@+id/AddCallCancelButton" android:text="@string/CancelButtonText"
-			android:layout_height="fill_parent" android:layout_width="fill_parent"
+			android:layout_height="wrap_content" android:layout_width="fill_parent"
 			android:layout_weight="1" android:background="@drawable/clavier_bg" />
 	</LinearLayout>
 
diff --git a/src/org/linphone/UriPickerActivity.java b/src/org/linphone/UriPickerActivity.java
index dad28f6b3..cbe48fe77 100644
--- a/src/org/linphone/UriPickerActivity.java
+++ b/src/org/linphone/UriPickerActivity.java
@@ -115,11 +115,14 @@ public class UriPickerActivity extends TabActivity implements ContactPicked {
 			mAddress = (AddressText) findViewById(R.id.SipUri);
 
 			addButton = (Button) findViewById(R.id.AddCallButton);
+//			addButton.setCompoundDrawablePadding(100);
 			addButton.setOnClickListener(this);
 			String type = getIntent().getStringExtra(EXTRA_PICKER_TYPE);
 			if (EXTRA_PICKER_TYPE_ADD.equals(type)) {
+				addButton.setCompoundDrawablesWithIntrinsicBounds(0, R.drawable.picker_plus, 0, 0);
 				addButton.setText(getString(R.string.AddCallButtonText));
 			} else if (EXTRA_PICKER_TYPE_TRANSFER.equals(type)) {
+				addButton.setCompoundDrawablesWithIntrinsicBounds(0, R.drawable.picker_transfer, 0, 0);
 				addButton.setText(getString(R.string.TransferCallButtonText));
 			} else {
 				throw new RuntimeException("unknown type");

From a6a62a9ae59bf0a87ae6b69cff9e6d2bdf818379 Mon Sep 17 00:00:00 2001
From: Guillaume Beraudo <guillaume.beraudo@belledonne-communications.com>
Date: Tue, 11 Oct 2011 14:39:26 +0200
Subject: [PATCH 41/62] Remove cancel button from UriPickerActivity. (use
 back).

---
 res/layout/simplified_dialer.xml        | 13 +++----------
 src/org/linphone/UriPickerActivity.java |  2 +-
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/res/layout/simplified_dialer.xml b/res/layout/simplified_dialer.xml
index 9c6632fcc..533bf797c 100644
--- a/res/layout/simplified_dialer.xml
+++ b/res/layout/simplified_dialer.xml
@@ -23,15 +23,8 @@
 		android:layout_width="fill_parent" android:layout_height="fill_parent"
 		android:layout_weight="4" />
 
-	<LinearLayout android:gravity="bottom"
-		android:layout_height="wrap_content" android:layout_width="fill_parent">
-		<Button android:id="@+id/AddCallButton" android:text="@string/AddCallButtonText"
-			android:gravity="bottom|center_horizontal"
-			android:layout_height="fill_parent" android:layout_width="fill_parent"
-			android:layout_weight="1" android:background="@drawable/clavier_bg" />
-		<Button android:id="@+id/AddCallCancelButton" android:text="@string/CancelButtonText"
-			android:layout_height="wrap_content" android:layout_width="fill_parent"
-			android:layout_weight="1" android:background="@drawable/clavier_bg" />
-	</LinearLayout>
+	<Button android:id="@+id/AddCallButton" android:text="@string/AddCallButtonText"
+		android:gravity="bottom|center_horizontal" android:layout_height="wrap_content"
+		android:layout_width="fill_parent" android:background="@drawable/clavier_bg" />
 
 </LinearLayout>
diff --git a/src/org/linphone/UriPickerActivity.java b/src/org/linphone/UriPickerActivity.java
index cbe48fe77..fa768a70f 100644
--- a/src/org/linphone/UriPickerActivity.java
+++ b/src/org/linphone/UriPickerActivity.java
@@ -128,7 +128,7 @@ public class UriPickerActivity extends TabActivity implements ContactPicked {
 				throw new RuntimeException("unknown type");
 			}
 
-			findViewById(R.id.AddCallCancelButton).setOnClickListener(this);
+//			findViewById(R.id.AddCallCancelButton).setOnClickListener(this);
 
 			super.onCreate(savedInstanceState);
 		}

From e38dfaf11db6b8c55a0d1a15ef50c5e3a030e14d Mon Sep 17 00:00:00 2001
From: Guillaume Beraudo <guillaume.beraudo@belledonne-communications.com>
Date: Tue, 11 Oct 2011 14:57:18 +0200
Subject: [PATCH 42/62] Don't pause but mute when add/transfer call in conf
 activity.

---
 src/org/linphone/ConferenceActivity.java | 37 +++++++++++++++---------
 1 file changed, 24 insertions(+), 13 deletions(-)

diff --git a/src/org/linphone/ConferenceActivity.java b/src/org/linphone/ConferenceActivity.java
index 042a61dbf..101183bf7 100644
--- a/src/org/linphone/ConferenceActivity.java
+++ b/src/org/linphone/ConferenceActivity.java
@@ -70,6 +70,7 @@ public class ConferenceActivity extends ListActivity implements
 	private View confHeaderView;
 	static boolean active;
 
+	private boolean unMuteOnReturnFromUriPicker;
 
 	// Start Override to test block
 	protected LinphoneCore lc() {
@@ -100,11 +101,11 @@ public class ConferenceActivity extends ListActivity implements
 				WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS);
 	}
 
-	private void pauseCurrentCallOrLeaveConference() {
-		LinphoneCall call = lc().getCurrentCall();
-		if (call != null) lc().pauseCall(call);
-		lc().leaveConference();
-	}
+//	private void pauseCurrentCallOrLeaveConference() {
+//		LinphoneCall call = lc().getCurrentCall();
+//		if (call != null) lc().pauseCall(call);
+//		lc().leaveConference();
+//	}
 
 	private LinphoneManagerWaitHelper waitHelper;
 	@Override
@@ -254,14 +255,21 @@ public class ConferenceActivity extends ListActivity implements
 //		v.setText(inConf ? R.string.in_conf : R.string.out_conf);
 	}
 
+	private void openUriPicker(String pickerType, int requestCode) {
+		Intent intent = new Intent().setClass(this, UriPickerActivity.class);
+		intent.putExtra(UriPickerActivity.EXTRA_PICKER_TYPE, pickerType);
+		startActivityForResult(intent, requestCode);
+		if (!lc().isMicMuted()) {
+			unMuteOnReturnFromUriPicker = true;
+			lc().muteMic(true);
+			((ToggleButton) findViewById(R.id.toggleMuteMic)).setChecked(true);
+		}
+	}
+
 	public void onClick(View v) {
 		switch (v.getId()) {
 		case R.id.addCall:
-			Intent intent = new Intent().setClass(this, UriPickerActivity.class);
-			intent.putExtra(UriPickerActivity.EXTRA_PICKER_TYPE, UriPickerActivity.EXTRA_PICKER_TYPE_ADD);
-			startActivityForResult(intent, ID_ADD_CALL);
-			pauseCurrentCallOrLeaveConference();
-			updateConfState();
+			openUriPicker(UriPickerActivity.EXTRA_PICKER_TYPE_ADD, ID_ADD_CALL);
 			break;
 		case R.id.conf_header:
 			View content = getLayoutInflater().inflate(R.layout.conf_choices_admin, null);
@@ -397,10 +405,8 @@ public class ConferenceActivity extends ListActivity implements
 				prepareForTransferingExistingCall(call);
 				break;
 			case R.id.transfer_new:
-				Intent intent = new Intent().setClass(ConferenceActivity.this, UriPickerActivity.class);
-				intent.putExtra(UriPickerActivity.EXTRA_PICKER_TYPE, UriPickerActivity.EXTRA_PICKER_TYPE_TRANSFER);
+				openUriPicker(UriPickerActivity.EXTRA_PICKER_TYPE_TRANSFER, ID_TRANSFER_CALL);
 				callToTransfer = call;	
-				startActivityForResult(intent, ID_TRANSFER_CALL);
 				break;
 			case R.id.remove_from_conference:
 				lc().removeFromConference(call);
@@ -673,6 +679,11 @@ public class ConferenceActivity extends ListActivity implements
 	private LinphoneCall callToTransfer;
 	@Override
 	protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+		if (unMuteOnReturnFromUriPicker) {
+			lc().muteMic(false);
+			((ToggleButton) findViewById(R.id.toggleMuteMic)).setChecked(false);
+		}
+
 		if (resultCode != RESULT_OK) {
 			callToTransfer = null;
 			Toast.makeText(this, R.string.uri_picking_canceled, Toast.LENGTH_LONG).show();

From de03952063f56957794fceec12d43c0060910a1d Mon Sep 17 00:00:00 2001
From: Guillaume Beraudo <guillaume.beraudo@belledonne-communications.com>
Date: Tue, 11 Oct 2011 15:04:44 +0200
Subject: [PATCH 43/62] Dependency linphone

---
 submodules/linphone | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/submodules/linphone b/submodules/linphone
index 0109d8680..12bf9694a 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 0109d8680d1dd3985d03854ee1a9670b355a7ba3
+Subproject commit 12bf9694a4b506c3145adfd2aaf90c49d72e3369

From 8720d698db5b39680620924fc715c433bad97c22 Mon Sep 17 00:00:00 2001
From: Guillaume Beraudo <guillaume.beraudo@belledonne-communications.com>
Date: Wed, 12 Oct 2011 09:16:29 +0200
Subject: [PATCH 44/62] Use CPU wake lock while a call is running.

Allow good audio quality while screen put to sleep.
---
 src/org/linphone/LinphoneManager.java | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java
index fe1e14262..7e81cccc1 100644
--- a/src/org/linphone/LinphoneManager.java
+++ b/src/org/linphone/LinphoneManager.java
@@ -129,6 +129,8 @@ public final class LinphoneManager implements LinphoneCoreListener {
 	private String basePath;
 	private static boolean sExited;
 
+	private WakeLock mIncallWakeLock;
+
 	private List<LinphoneSimpleListener> simpleListeners = new ArrayList<LinphoneSimpleListener>();
 	public void addListener(LinphoneSimpleListener listener) {
 		if (!simpleListeners.contains(listener)) {
@@ -742,7 +744,7 @@ public final class LinphoneManager implements LinphoneCoreListener {
 			stopRinging();
 			routeAudioToReceiver();
 		}
-		
+
 		if (state == CallEnd || state == Error) {
 			mAudioManager.setMode(MODE_NORMAL);
 		}
@@ -753,6 +755,27 @@ public final class LinphoneManager implements LinphoneCoreListener {
 			}
 		}
 
+		if (state == CallEnd) {
+			if (mLc.getCallsNb() == 0) {
+				if (mIncallWakeLock != null && mIncallWakeLock.isHeld()) {
+					mIncallWakeLock.release();
+					Log.i("Last call ended: releasing incall (CPU only) wake lock");
+				} else {
+					Log.i("Last call ended: no incall (CPU only) wake lock were held");
+				}
+			}
+		}
+		if (state == State.StreamsRunning) {
+			if (mIncallWakeLock == null) {
+				mIncallWakeLock = mPowerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK,	"incall");
+			}
+			if (!mIncallWakeLock.isHeld()) {
+				Log.i("New call active : acquiring incall (CPU only) wake lock");
+				mIncallWakeLock.acquire();
+			} else {
+				Log.i("New call active while incall (CPU only) wake lock already active");
+			}
+		}
 		mCurrentCallState=state;
 		listenerDispatcher.onCallStateChanged(call, state, message);
 	}

From 0f02bb1a145609ae56cc5053cd6cf6be3b14e708 Mon Sep 17 00:00:00 2001
From: Guillaume Beraudo <guillaume.beraudo@belledonne-communications.com>
Date: Wed, 12 Oct 2011 10:33:43 +0200
Subject: [PATCH 45/62] Fix mute and speaker button state in conference.

The states wasn't loaded on activity resume.
---
 src/org/linphone/ConferenceActivity.java | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/org/linphone/ConferenceActivity.java b/src/org/linphone/ConferenceActivity.java
index 101183bf7..210ddf3f4 100644
--- a/src/org/linphone/ConferenceActivity.java
+++ b/src/org/linphone/ConferenceActivity.java
@@ -108,6 +108,8 @@ public class ConferenceActivity extends ListActivity implements
 //	}
 
 	private LinphoneManagerWaitHelper waitHelper;
+	private ToggleButton mMuteMicButton;
+	private ToggleButton mSpeakerButton;
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		setContentView(R.layout.conferencing);
@@ -122,8 +124,10 @@ public class ConferenceActivity extends ListActivity implements
 		findViewById(R.id.conf_simple_transfer).setOnClickListener(this);
 		findViewById(R.id.conf_simple_permute).setOnClickListener(this);
 
-		findViewById(R.id.toggleMuteMic).setOnClickListener(this);
-		findViewById(R.id.toggleSpeaker).setOnClickListener(this);
+		mMuteMicButton = (ToggleButton) findViewById(R.id.toggleMuteMic);
+		mMuteMicButton.setOnClickListener(this);
+		mSpeakerButton = (ToggleButton) findViewById(R.id.toggleSpeaker);
+		mSpeakerButton.setOnClickListener(this);
 
 		waitHelper = new LinphoneManagerWaitHelper(this, this);
 		waitHelper.doManagerDependentOnCreate();
@@ -141,6 +145,8 @@ public class ConferenceActivity extends ListActivity implements
 	@Override
 	public void onResumeWhenManagerReady() {
 		registerLinphoneListener(true);
+		mSpeakerButton.setChecked(LinphoneManager.getInstance().isSpeakerOn());
+		mMuteMicButton.setChecked(LinphoneManager.getLc().isMicMuted());
 		updateCalleeImage();
 		updateConfState();
 		updateSimpleControlButtons();

From d932632a3bfbdf8e802ceb88b992e327dc81394c Mon Sep 17 00:00:00 2001
From: Guillaume Beraudo <guillaume.beraudo@belledonne-communications.com>
Date: Wed, 12 Oct 2011 10:34:43 +0200
Subject: [PATCH 46/62] Incoming call when already a call running beep.

No more ringing and beep at the same time.
Note that is the user is on speaker it will beep on speaker,
which is what is expected.
---
 src/org/linphone/LinphoneManager.java | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java
index 7e81cccc1..88333772f 100644
--- a/src/org/linphone/LinphoneManager.java
+++ b/src/org/linphone/LinphoneManager.java
@@ -261,8 +261,11 @@ public final class LinphoneManager implements LinphoneCoreListener {
 
 	
 	public boolean isSpeakerOn() {
-		return (Integer.parseInt(Build.VERSION.SDK) <=4 && mAudioManager.getRouting(MODE_NORMAL) == ROUTE_SPEAKER) 
-		|| Integer.parseInt(Build.VERSION.SDK) >4 &&mAudioManager.isSpeakerphoneOn();
+		if (Hacks.needRoutingAPI() || lpm.useAudioRoutingAPIHack()) {
+			return mAudioManager.getRouting(MODE_NORMAL) == ROUTE_SPEAKER;
+		} else {
+			return mAudioManager.isSpeakerphoneOn(); 
+		}
 	}
 
 	
@@ -736,13 +739,18 @@ public final class LinphoneManager implements LinphoneCoreListener {
 					"incoming_call");
 			wl.acquire(10000);
 
-			startRinging();
+			if (mLc.getCallsNb() == 1) {
+				startRinging();
+				// otherwise there is the beep
+			}
 		}
 
 		if (mCurrentCallState == IncomingReceived) { 
 			//previous state was ringing, so stop ringing
-			stopRinging();
-			routeAudioToReceiver();
+			if (isRinging) {
+				stopRinging();
+				routeAudioToReceiver();
+			}
 		}
 
 		if (state == CallEnd || state == Error) {
@@ -811,6 +819,7 @@ public final class LinphoneManager implements LinphoneCoreListener {
 
 
 
+	private boolean isRinging;
 	private synchronized void startRinging()  {
 		if (Hacks.needGalaxySAudioHack()) {
 			mAudioManager.setMode(MODE_RINGTONE);
@@ -834,7 +843,7 @@ public final class LinphoneManager implements LinphoneCoreListener {
 		} catch (Exception e) {
 			Log.e(e,"cannot handle incoming call");
 		}
-
+		isRinging = true;
 	}
 
 	private synchronized void stopRinging() {
@@ -847,6 +856,7 @@ public final class LinphoneManager implements LinphoneCoreListener {
 			mVibrator.cancel();
 		}
 
+		isRinging = false;
 		// You may need to call galaxys audio hack after this method
 	}
 
@@ -881,7 +891,7 @@ public final class LinphoneManager implements LinphoneCoreListener {
 	}
 
 	public void setAudioModeIncallForGalaxyS() {
-		stopRinging();
+//		if (isRinging) stopRinging();     // FIXME was this line useful?
 		mAudioManager.setMode(MODE_IN_CALL);
 	}
 

From 2a54fc632f5e116640f16535761ac254691ce770 Mon Sep 17 00:00:00 2001
From: Guillaume Beraudo <guillaume.beraudo@belledonne-communications.com>
Date: Wed, 12 Oct 2011 11:30:14 +0200
Subject: [PATCH 47/62] Delay mic/speaker state update in conference activity.

Otherwise the state is still in speaker due to ringing just ended.
---
 src/org/linphone/ConferenceActivity.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/org/linphone/ConferenceActivity.java b/src/org/linphone/ConferenceActivity.java
index 210ddf3f4..5fe7de921 100644
--- a/src/org/linphone/ConferenceActivity.java
+++ b/src/org/linphone/ConferenceActivity.java
@@ -145,8 +145,6 @@ public class ConferenceActivity extends ListActivity implements
 	@Override
 	public void onResumeWhenManagerReady() {
 		registerLinphoneListener(true);
-		mSpeakerButton.setChecked(LinphoneManager.getInstance().isSpeakerOn());
-		mMuteMicButton.setChecked(LinphoneManager.getLc().isMicMuted());
 		updateCalleeImage();
 		updateConfState();
 		updateSimpleControlButtons();
@@ -154,6 +152,8 @@ public class ConferenceActivity extends ListActivity implements
 		adapter.notifyDataSetInvalidated();
 		adapter.notifyDataSetChanged();
 		LinphoneManager.startProximitySensorForActivity(this);
+		mSpeakerButton.setChecked(LinphoneManager.getInstance().isSpeakerOn());
+		mMuteMicButton.setChecked(LinphoneManager.getLc().isMicMuted());
 	}
 
 	@Override

From 31a660a6a11b62fec30ff6fecaddf8ae44a58ed6 Mon Sep 17 00:00:00 2001
From: Guillaume Beraudo <guillaume.beraudo@belledonne-communications.com>
Date: Wed, 12 Oct 2011 16:01:38 +0200
Subject: [PATCH 48/62] Uri picker dialer don't play dtmf but concatenate to
 address.

---
 res/layout/simplified_dialer.xml        |  3 +-
 res/values/digit_style.xml              |  9 ++++
 src/org/linphone/LinphoneManager.java   |  3 +-
 src/org/linphone/UriPickerActivity.java |  3 ++
 src/org/linphone/ui/Digit.java          | 55 ++++++++++++++++---------
 src/org/linphone/ui/Numpad.java         | 26 +++++++++---
 6 files changed, 70 insertions(+), 29 deletions(-)

diff --git a/res/layout/simplified_dialer.xml b/res/layout/simplified_dialer.xml
index 533bf797c..7574a9166 100644
--- a/res/layout/simplified_dialer.xml
+++ b/res/layout/simplified_dialer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:linphone="http://schemas.android.com/apk/res/linphone"
+	xmlns:linphone="http://schemas.android.com/apk/res/org.linphone"
 	android:orientation="vertical" android:layout_width="fill_parent"
 	android:layout_height="fill_parent">
 
@@ -20,6 +20,7 @@
 	</LinearLayout>
 
 	<org.linphone.ui.Numpad android:id="@+id/Dialer"
+		linphone:play_dtmf="dont"
 		android:layout_width="fill_parent" android:layout_height="fill_parent"
 		android:layout_weight="4" />
 
diff --git a/res/values/digit_style.xml b/res/values/digit_style.xml
index 400132100..d5f17e13a 100644
--- a/res/values/digit_style.xml
+++ b/res/values/digit_style.xml
@@ -9,4 +9,13 @@
         <item name="android:textSize">20sp</item>
         <item name="android:layout_weight">1</item>
     </style>
+
+
+
+	<declare-styleable name="Numpad">
+		<attr name="play_dtmf">
+			<enum name="dont" value="0" />
+			<enum name="play" value="1" />
+		</attr>
+	</declare-styleable>
 </resources>
\ No newline at end of file
diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java
index 88333772f..3eeda0e5e 100644
--- a/src/org/linphone/LinphoneManager.java
+++ b/src/org/linphone/LinphoneManager.java
@@ -88,7 +88,6 @@ import android.media.AudioManager;
 import android.media.MediaPlayer;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
-import android.os.Build;
 import android.os.PowerManager;
 import android.os.Vibrator;
 import android.os.PowerManager.WakeLock;
@@ -242,7 +241,7 @@ public final class LinphoneManager implements LinphoneCoreListener {
 			AndroidVideoApi5JniWrapper.setAndroidSdkVersion(Version.sdk());
 		return instance;
 	}
-	
+
 	public static synchronized final LinphoneManager getInstance() {
 		if (instance != null) return instance;
 
diff --git a/src/org/linphone/UriPickerActivity.java b/src/org/linphone/UriPickerActivity.java
index fa768a70f..37a91a03a 100644
--- a/src/org/linphone/UriPickerActivity.java
+++ b/src/org/linphone/UriPickerActivity.java
@@ -20,7 +20,9 @@ package org.linphone;
 
 
 import org.linphone.mediastream.Version;
+import org.linphone.ui.AddressAware;
 import org.linphone.ui.AddressText;
+import org.linphone.ui.Numpad;
 
 import android.app.Activity;
 import android.app.TabActivity;
@@ -130,6 +132,7 @@ public class UriPickerActivity extends TabActivity implements ContactPicked {
 
 //			findViewById(R.id.AddCallCancelButton).setOnClickListener(this);
 
+			((AddressAware)findViewById(R.id.Dialer)).setAddressWidget(mAddress);
 			super.onCreate(savedInstanceState);
 		}
 
diff --git a/src/org/linphone/ui/Digit.java b/src/org/linphone/ui/Digit.java
index e3de49152..75e833845 100644
--- a/src/org/linphone/ui/Digit.java
+++ b/src/org/linphone/ui/Digit.java
@@ -34,8 +34,15 @@ import android.widget.Toast;
 public class Digit extends Button implements AddressAware {
 
 	private AddressText mAddress;
+	public void setAddressWidget(AddressText address) {
+		mAddress = address;
+	}
+
+	private boolean mPlayDtmf;
+	public void setPlayDtmf(boolean play) {
+		mPlayDtmf = play;
+	}
 
-	
 	@Override
 	protected void onTextChanged(CharSequence text, int start, int before,
 			int after) {
@@ -75,7 +82,7 @@ public class Digit extends Button implements AddressAware {
 
 	private class DialKeyListener implements OnClickListener, OnTouchListener, OnLongClickListener {
 		final CharSequence mKeyCode;
-		boolean mIsDtmfStarted=false;
+		boolean mIsDtmfStarted;
 
 		DialKeyListener() {
 			mKeyCode = Digit.this.getText().subSequence(0, 1);
@@ -89,15 +96,20 @@ public class Digit extends Button implements AddressAware {
 			}
 			return true;
 		}
-		public void onClick(View v) {
-			if (!linphoneServiceReady()) return;
-			LinphoneCore lc = LinphoneManager.getLc();
-			lc.stopDtmf();
-			mIsDtmfStarted =false;
 
-			if (lc.isIncall()) {
-				lc.sendDtmf(mKeyCode.charAt(0));
-			} else if (mAddress != null) {
+		public void onClick(View v) {
+			if (mPlayDtmf) {
+				if (!linphoneServiceReady()) return;
+				LinphoneCore lc = LinphoneManager.getLc();
+				lc.stopDtmf();
+				mIsDtmfStarted =false;
+				if (lc.isIncall()) {
+					lc.sendDtmf(mKeyCode.charAt(0));
+					return;
+				}
+			}
+			
+			if (mAddress != null) {
 				int lBegin = mAddress.getSelectionStart();
 				if (lBegin == -1) {
 					lBegin = mAddress.length();
@@ -109,24 +121,29 @@ public class Digit extends Button implements AddressAware {
 		}
 
 		public boolean onTouch(View v, MotionEvent event) {
+			if (!mPlayDtmf) return false;
 			if (!linphoneServiceReady()) return true;
+
 			LinphoneCore lc = LinphoneManager.getLc();
-			if (event.getAction() == MotionEvent.ACTION_DOWN && mIsDtmfStarted ==false) {
+			if (event.getAction() == MotionEvent.ACTION_DOWN && !mIsDtmfStarted) {
 				LinphoneManager.getInstance().playDtmf(getContext().getContentResolver(), mKeyCode.charAt(0));
 				mIsDtmfStarted=true;
 			} else {
-				if (event.getAction() == MotionEvent.ACTION_UP) 
+				if (event.getAction() == MotionEvent.ACTION_UP) {
 					lc.stopDtmf();
-					mIsDtmfStarted =false;
+					mIsDtmfStarted=false;
+				}
 			}
 			return false;
 		}
 		
 		public boolean onLongClick(View v) {
-			if (!linphoneServiceReady()) return true;
-			// Called if "0+" dtmf
-			LinphoneCore lc = LinphoneManager.getLc();
-			lc.stopDtmf();
+			if (mPlayDtmf) {
+				if (!linphoneServiceReady()) return true;
+				// Called if "0+" dtmf
+				LinphoneCore lc = LinphoneManager.getLc();
+				lc.stopDtmf();
+			}
 			
 			if (mAddress == null) return true;
 
@@ -141,7 +158,5 @@ public class Digit extends Button implements AddressAware {
 		}
 	};
 	
-	public void setAddressWidget(AddressText address) {
-		mAddress = address;
-	}
+
 }
diff --git a/src/org/linphone/ui/Numpad.java b/src/org/linphone/ui/Numpad.java
index 5a0a19e1d..fe02e34c2 100644
--- a/src/org/linphone/ui/Numpad.java
+++ b/src/org/linphone/ui/Numpad.java
@@ -24,6 +24,7 @@ import java.util.Collection;
 import org.linphone.R;
 
 import android.content.Context;
+import android.content.res.TypedArray;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -36,29 +37,42 @@ import android.widget.LinearLayout;
  */
 public class Numpad extends LinearLayout implements AddressAware {
 
+	private boolean mPlayDtmf;
+
+
 	public Numpad(Context context, AttributeSet attrs) {
 		super(context, attrs);
 		LayoutInflater.from(context).inflate(R.layout.numpad, this);
 		setLongClickable(true);
+		TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.Numpad);
+        mPlayDtmf = 1 == a.getInt(org.linphone.R.styleable.Numpad_play_dtmf, 1);
+        a.recycle();
 	}
 
+	@Override
+	protected void onFinishInflate() {
+		for (Digit v : retrieveChildren(this, Digit.class)) {
+			v.setPlayDtmf(mPlayDtmf);
+		}
+		super.onFinishInflate();
+	}
 	public void setAddressWidget(AddressText address) {
-		for (AddressAware v : retrieveChildren(this)) {
+		for (AddressAware v : retrieveChildren(this, AddressAware.class)) {
 			v.setAddressWidget(address);
 		}
 	}
 
 
-	private Collection<AddressAware> retrieveChildren(ViewGroup viewGroup) {
-		final Collection<AddressAware> views = new ArrayList<AddressAware>();
+	private <T> Collection<T> retrieveChildren(ViewGroup viewGroup, Class<T> clazz) {
+		final Collection<T> views = new ArrayList<T>();
 
 		for (int i = 0; i < viewGroup.getChildCount(); i++) {
 			View v = viewGroup.getChildAt(i);
 			if (v instanceof ViewGroup) {
-				views.addAll(retrieveChildren((ViewGroup) v));
+				views.addAll(retrieveChildren((ViewGroup) v, clazz));
 			} else {
-				if (v instanceof AddressAware)
-					views.add((AddressAware) v);
+				if (clazz.isInstance(v))
+					views.add(clazz.cast(v));
 			}
 		}
 

From 6fe3390dcebe163a11ced364181bde113d1f6df0 Mon Sep 17 00:00:00 2001
From: Guillaume Beraudo <guillaume.beraudo@belledonne-communications.com>
Date: Thu, 13 Oct 2011 15:01:11 +0200
Subject: [PATCH 49/62] Fix: Erase button of Uri picker now works.

---
 src/org/linphone/DialerActivity.java    | 2 +-
 src/org/linphone/UriPickerActivity.java | 2 +-
 src/org/linphone/ui/EraseButton.java    | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/org/linphone/DialerActivity.java b/src/org/linphone/DialerActivity.java
index bbeaff1e4..e15b16a2b 100644
--- a/src/org/linphone/DialerActivity.java
+++ b/src/org/linphone/DialerActivity.java
@@ -120,7 +120,7 @@ public class DialerActivity extends Activity implements LinphoneGuiListener, Lin
 
 		mAddress = (AddressText) findViewById(R.id.SipUri); 
 		mDisplayNameView = (TextView) findViewById(R.id.DisplayNameView);
-		((EraseButton) findViewById(R.id.Erase)).setAddressView(mAddress);
+		((EraseButton) findViewById(R.id.Erase)).setAddressWidget(mAddress);
 
 
 		mCall = (CallButton) findViewById(R.id.Call);
diff --git a/src/org/linphone/UriPickerActivity.java b/src/org/linphone/UriPickerActivity.java
index 37a91a03a..105face5f 100644
--- a/src/org/linphone/UriPickerActivity.java
+++ b/src/org/linphone/UriPickerActivity.java
@@ -22,7 +22,6 @@ package org.linphone;
 import org.linphone.mediastream.Version;
 import org.linphone.ui.AddressAware;
 import org.linphone.ui.AddressText;
-import org.linphone.ui.Numpad;
 
 import android.app.Activity;
 import android.app.TabActivity;
@@ -133,6 +132,7 @@ public class UriPickerActivity extends TabActivity implements ContactPicked {
 //			findViewById(R.id.AddCallCancelButton).setOnClickListener(this);
 
 			((AddressAware)findViewById(R.id.Dialer)).setAddressWidget(mAddress);
+			((AddressAware)findViewById(R.id.Erase)).setAddressWidget(mAddress);
 			super.onCreate(savedInstanceState);
 		}
 
diff --git a/src/org/linphone/ui/EraseButton.java b/src/org/linphone/ui/EraseButton.java
index 8e253e765..289b8fa50 100644
--- a/src/org/linphone/ui/EraseButton.java
+++ b/src/org/linphone/ui/EraseButton.java
@@ -25,7 +25,7 @@ import android.view.View.OnClickListener;
 import android.view.View.OnLongClickListener;
 import android.widget.Button;
 
-public class EraseButton extends Button implements OnClickListener, OnLongClickListener{
+public class EraseButton extends Button implements AddressAware, OnClickListener, OnLongClickListener{
 
 	private AddressText address;
 
@@ -52,7 +52,7 @@ public class EraseButton extends Button implements OnClickListener, OnLongClickL
 		return true;
 	}
 
-	public void setAddressView(AddressText view) {
+	public void setAddressWidget(AddressText view) {
 		address = view;
 	}
 

From 1724555a8cc1b54995e6cf83fc8618871ee44f67 Mon Sep 17 00:00:00 2001
From: Guillaume Beraudo <guillaume.beraudo@belledonne-communications.com>
Date: Thu, 13 Oct 2011 15:57:31 +0200
Subject: [PATCH 50/62] Try to resume call, enter conf on URI picker return.

---
 src/org/linphone/ConferenceActivity.java | 34 ++++++++++++++++++++----
 1 file changed, 29 insertions(+), 5 deletions(-)

diff --git a/src/org/linphone/ConferenceActivity.java b/src/org/linphone/ConferenceActivity.java
index 5fe7de921..78e4d1bf3 100644
--- a/src/org/linphone/ConferenceActivity.java
+++ b/src/org/linphone/ConferenceActivity.java
@@ -101,11 +101,11 @@ public class ConferenceActivity extends ListActivity implements
 				WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS);
 	}
 
-//	private void pauseCurrentCallOrLeaveConference() {
-//		LinphoneCall call = lc().getCurrentCall();
-//		if (call != null) lc().pauseCall(call);
-//		lc().leaveConference();
-//	}
+	private void pauseCurrentCallOrLeaveConference() {
+		LinphoneCall call = lc().getCurrentCall();
+		if (call != null) lc().pauseCall(call);
+		lc().leaveConference();
+	}
 
 	private LinphoneManagerWaitHelper waitHelper;
 	private ToggleButton mMuteMicButton;
@@ -261,7 +261,12 @@ public class ConferenceActivity extends ListActivity implements
 //		v.setText(inConf ? R.string.in_conf : R.string.out_conf);
 	}
 
+	private LinphoneCall activateCallOnReturnFromUriPicker;
+	private boolean enterConferenceOnReturnFromUriPicker;
 	private void openUriPicker(String pickerType, int requestCode) {
+		activateCallOnReturnFromUriPicker = lc().getCurrentCall();
+		enterConferenceOnReturnFromUriPicker = lc().isInConference();
+		pauseCurrentCallOrLeaveConference();
 		Intent intent = new Intent().setClass(this, UriPickerActivity.class);
 		intent.putExtra(UriPickerActivity.EXTRA_PICKER_TYPE, pickerType);
 		startActivityForResult(intent, requestCode);
@@ -693,6 +698,7 @@ public class ConferenceActivity extends ListActivity implements
 		if (resultCode != RESULT_OK) {
 			callToTransfer = null;
 			Toast.makeText(this, R.string.uri_picking_canceled, Toast.LENGTH_LONG).show();
+			eventuallyResumeConfOrCallOnPickerReturn(true);
 			return;
 		}
 
@@ -701,6 +707,7 @@ public class ConferenceActivity extends ListActivity implements
 		case ID_ADD_CALL:
 			try {
 				lc().invite(uri);
+				eventuallyResumeConfOrCallOnPickerReturn(false);
 			} catch (LinphoneCoreException e) {
 				Log.e(e);
 				Toast.makeText(this, R.string.error_adding_new_call, Toast.LENGTH_LONG).show();
@@ -708,6 +715,11 @@ public class ConferenceActivity extends ListActivity implements
 			break;
 		case ID_TRANSFER_CALL:
 			lc().transferCall(callToTransfer, uri);
+			// don't re-enter conference if call to transfer from conference
+			boolean doResume = !callToTransfer.isInConference();
+			// don't resume call if it is the call to transfer
+			doResume &= activateCallOnReturnFromUriPicker != callToTransfer;
+			eventuallyResumeConfOrCallOnPickerReturn(doResume);
 			Toast.makeText(this, R.string.transfer_started, Toast.LENGTH_LONG).show();
 			break;
 		default:
@@ -715,6 +727,18 @@ public class ConferenceActivity extends ListActivity implements
 		}
 	}
 
+	private void eventuallyResumeConfOrCallOnPickerReturn(boolean doCallConfResuming) {
+		if (doCallConfResuming) {
+			if (activateCallOnReturnFromUriPicker != null) {
+				lc().resumeCall(activateCallOnReturnFromUriPicker);
+			} else if (enterConferenceOnReturnFromUriPicker) {
+				lc().enterConference();
+			}
+		}
+		activateCallOnReturnFromUriPicker = null;
+		enterConferenceOnReturnFromUriPicker = false;
+	}
+
 	@Override
 	public boolean onKeyUp(int keyCode, KeyEvent event) {
 		if (LinphoneUtils.onKeyBackGoHome(this, keyCode)) return true;

From c71597e27e2eba12799b1403af6877991bc9ae2f Mon Sep 17 00:00:00 2001
From: Guillaume Beraudo <guillaume.beraudo@belledonne-communications.com>
Date: Fri, 14 Oct 2011 10:48:35 +0200
Subject: [PATCH 51/62] Move git repositories from savannah.

---
 .gitmodules | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 18aa2320a..0b37b3c3e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,9 @@
 [submodule "linphone"]
 	path = submodules/linphone
-	url = git://git.savannah.nongnu.org/linphone.git
+	url = git://git.linphone.org/linphone.git
 [submodule "submodules/externals/osip"]
 	path = submodules/externals/osip
-	url = git://git.savannah.gnu.org/osip.git
+	url = git://git.linphone.org/osip.git
 [submodule "submodules/externals/exosip"]
 	path = submodules/externals/exosip
 	url = git://git.linphone.org/exosip.git

From fc67293df458d502c450872602476c2c237183f1 Mon Sep 17 00:00:00 2001
From: Guillaume Beraudo <guillaume.beraudo@belledonne-communications.com>
Date: Fri, 14 Oct 2011 12:25:11 +0200
Subject: [PATCH 52/62] Foreground service (fix choppy sound when not visible)

---
 src/org/linphone/ConferenceActivity.java |   2 +-
 src/org/linphone/ContactHelper.java      |   2 +-
 src/org/linphone/LinphoneService.java    | 107 +++++++++++++++++++++--
 src/org/linphone/LinphoneUtils.java      |   2 +-
 4 files changed, 102 insertions(+), 11 deletions(-)

diff --git a/src/org/linphone/ConferenceActivity.java b/src/org/linphone/ConferenceActivity.java
index 78e4d1bf3..acba9ea0c 100644
--- a/src/org/linphone/ConferenceActivity.java
+++ b/src/org/linphone/ConferenceActivity.java
@@ -485,7 +485,7 @@ public class ConferenceActivity extends ListActivity implements
 		public View getView(int position, View v, ViewGroup parent) {
 			Log.i("ConferenceActivity.getView(",position,") out of ", linphoneCalls.size());
 			if (v == null) {
-				if (Version.sdkAboveOrEqual(Version.API06_ECLAIR_20)) {
+				if (Version.sdkAboveOrEqual(Version.API06_ECLAIR_201)) {
 					v = getLayoutInflater().inflate(R.layout.conf_callee, null);
 				} else {
 					v = getLayoutInflater().inflate(R.layout.conf_callee_older_devices, null);
diff --git a/src/org/linphone/ContactHelper.java b/src/org/linphone/ContactHelper.java
index 62a7b8717..2ab2bd3e8 100644
--- a/src/org/linphone/ContactHelper.java
+++ b/src/org/linphone/ContactHelper.java
@@ -56,7 +56,7 @@ public final class ContactHelper {
 
 	public boolean query() {
 		boolean succeeded;
-		if (Version.sdkAboveOrEqual(Version.API06_ECLAIR_20)) {
+		if (Version.sdkAboveOrEqual(Version.API06_ECLAIR_201)) {
 			ContactHelperNew helper = new ContactHelperNew();
 			succeeded = helper.queryNewContactAPI();
 		} else {
diff --git a/src/org/linphone/LinphoneService.java b/src/org/linphone/LinphoneService.java
index 43e48678d..d6fb3bc74 100644
--- a/src/org/linphone/LinphoneService.java
+++ b/src/org/linphone/LinphoneService.java
@@ -19,6 +19,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 package org.linphone;
 
 import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 
 import org.linphone.LinphoneManager.NewOutgoingCallUiListener;
 import org.linphone.LinphoneSimpleListener.LinphoneServiceListener;
@@ -34,7 +36,6 @@ import android.app.Notification;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.app.Service;
-import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager.NameNotFoundException;
@@ -80,7 +81,6 @@ public final class LinphoneService extends Service implements LinphoneServiceLis
 	}
 
 	
-	private NotificationManager mNotificationMgr;
 	private final static int NOTIF_ID=1;
 
 	private Notification mNotif;
@@ -115,7 +115,7 @@ public final class LinphoneService extends Service implements LinphoneServiceLis
 		dumpDeviceInformation();
 		dumpInstalledLinphoneInformation();
 
-		mNotificationMgr = (NotificationManager) this.getSystemService(Context.NOTIFICATION_SERVICE);
+		mNM = (NotificationManager) getSystemService(NOTIFICATION_SERVICE);
 		mNotif = new Notification(R.drawable.status_level, "", System.currentTimeMillis());
 		mNotif.iconLevel=IC_LEVEL_ORANGE;
 		mNotif.flags |= Notification.FLAG_ONGOING_EVENT;
@@ -123,16 +123,106 @@ public final class LinphoneService extends Service implements LinphoneServiceLis
 		Intent notifIntent = new Intent(this, LinphoneActivity.class);
 		mNotifContentIntent = PendingIntent.getActivity(this, 0, notifIntent, 0);
 		mNotif.setLatestEventInfo(this, notificationTitle,"", mNotifContentIntent);
-		mNotificationMgr.notify(NOTIF_ID, mNotif);		
-	
 	
 		LinphoneManager.createAndStart(this, this);
 		LinphoneManager.getLc().setPresenceInfo(0, null, OnlineStatus.Online);
 		instance = this; // instance is ready once linphone manager has been created
+
+
+		// Retrieve methods to publish notification and keep Android
+		// from killing us and keep the audio quality high.
+		if (Version.sdkStrictlyBelow(Version.API05_ECLAIR_20)) {
+			try {
+				mSetForeground = getClass().getMethod("setForeground", mSetFgSign);
+			} catch (NoSuchMethodException e) {
+				Log.e(e, "Couldn't find foreground method");
+			}
+		} else {
+			try {
+				mStartForeground = getClass().getMethod("startForeground", mStartFgSign);
+				mStopForeground = getClass().getMethod("stopForeground", mStopFgSign);
+			} catch (NoSuchMethodException e) {
+				Log.e(e, "Couldn't find startGoreground or stopForeground");
+			}
+		}
+
+		startForegroundCompat(NOTIF_ID, mNotif);
 	}
 
 
 
+	private static final Class<?>[] mSetFgSign = new Class[] {boolean.class};
+	private static final Class<?>[] mStartFgSign = new Class[] {
+		int.class, Notification.class};
+	private static final Class<?>[] mStopFgSign = new Class[] {boolean.class};
+
+	private NotificationManager mNM;
+	private Method mSetForeground;
+	private Method mStartForeground;
+	private Method mStopForeground;
+	private Object[] mSetForegroundArgs = new Object[1];
+	private Object[] mStartForegroundArgs = new Object[2];
+	private Object[] mStopForegroundArgs = new Object[1];
+
+	void invokeMethod(Method method, Object[] args) {
+		try {
+			method.invoke(this, args);
+		} catch (InvocationTargetException e) {
+			// Should not happen.
+			Log.w(e, "Unable to invoke method");
+		} catch (IllegalAccessException e) {
+			// Should not happen.
+			Log.w(e, "Unable to invoke method");
+		}
+	}
+
+	/**
+	 * This is a wrapper around the new startForeground method, using the older
+	 * APIs if it is not available.
+	 */
+	void startForegroundCompat(int id, Notification notification) {
+		// If we have the new startForeground API, then use it.
+		if (mStartForeground != null) {
+			mStartForegroundArgs[0] = Integer.valueOf(id);
+			mStartForegroundArgs[1] = notification;
+			invokeMethod(mStartForeground, mStartForegroundArgs);
+			return;
+		}
+
+		// Fall back on the old API.
+		if (mSetForeground != null) {
+			mSetForegroundArgs[0] = Boolean.TRUE;
+			invokeMethod(mSetForeground, mSetForegroundArgs);
+			// continue
+		}
+
+		mNM.notify(id, notification);
+	}
+
+	/**
+	 * This is a wrapper around the new stopForeground method, using the older
+	 * APIs if it is not available.
+	 */
+	void stopForegroundCompat(int id) {
+		// If we have the new stopForeground API, then use it.
+		if (mStopForeground != null) {
+			mStopForegroundArgs[0] = Boolean.TRUE;
+			invokeMethod(mStopForeground, mStopForegroundArgs);
+			return;
+		}
+
+		// Fall back on the old API.  Note to cancel BEFORE changing the
+		// foreground state, since we could be killed at that point.
+		mNM.cancel(id);
+		if (mSetForeground != null) {
+			mSetForegroundArgs[0] = Boolean.FALSE;
+			invokeMethod(mSetForeground, mSetForegroundArgs);
+		}
+	}
+
+
+
+
 	public static final String START_LINPHONE_LOGS = " ==== Phone information dump ====";
 	private void dumpDeviceInformation() {
 		StringBuilder sb = new StringBuilder();
@@ -169,7 +259,7 @@ public final class LinphoneService extends Service implements LinphoneServiceLis
 		}
 		
 		mNotif.setLatestEventInfo(this, notificationTitle, text, mNotifContentIntent);
-		mNotificationMgr.notify(NOTIF_ID, mNotif);
+		mNM.notify(NOTIF_ID, mNotif);
 	}
 
 
@@ -183,10 +273,11 @@ public final class LinphoneService extends Service implements LinphoneServiceLis
 	@Override
 	public void onDestroy() {
 		super.onDestroy();
+	    // Make sure our notification is gone.
+	    stopForegroundCompat(NOTIF_ID);
+
 		LinphoneManager.getLcIfManagerNotDestroyedOrNull().setPresenceInfo(0, null, OnlineStatus.Offline);
 		LinphoneManager.destroy(this);
-
-		mNotificationMgr.cancel(NOTIF_ID);
 		instance=null;
 	}
 
diff --git a/src/org/linphone/LinphoneUtils.java b/src/org/linphone/LinphoneUtils.java
index 528ec3d77..7148c29cc 100644
--- a/src/org/linphone/LinphoneUtils.java
+++ b/src/org/linphone/LinphoneUtils.java
@@ -118,7 +118,7 @@ public final class LinphoneUtils {
 			if (bm == null) view.setImageResource(notFoundResource);
 			view.setImageBitmap(bm);
 		} else {
-			if (Version.sdkAboveOrEqual(Version.API06_ECLAIR_20)) {
+			if (Version.sdkAboveOrEqual(Version.API06_ECLAIR_201)) {
 				view.setImageURI(uri);
 			} else {
 				Bitmap bitmap = android.provider.Contacts.People.loadContactPhoto(c, uri, notFoundResource, null);

From d1be587f12e7d9f3211f6b768fa6421ca68ef1cb Mon Sep 17 00:00:00 2001
From: Guillaume Beraudo <guillaume.beraudo@belledonne-communications.com>
Date: Fri, 14 Oct 2011 16:58:55 +0200
Subject: [PATCH 53/62] Update dependencies.

---
 src/org/linphone/DialerActivity.java | 7 +------
 submodules/externals/osip            | 2 +-
 submodules/linphone                  | 2 +-
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/org/linphone/DialerActivity.java b/src/org/linphone/DialerActivity.java
index 7d8ff41a5..0ecfb3767 100644
--- a/src/org/linphone/DialerActivity.java
+++ b/src/org/linphone/DialerActivity.java
@@ -86,7 +86,6 @@ public class DialerActivity extends Activity implements LinphoneGuiListener, Lin
 	
 	private PowerManager.WakeLock mWakeLock;
 	private SharedPreferences mPref;
-	private LinphoneCall mCurrentCall;
 	private boolean useIncallActivity;
 	private boolean useVideoActivity;
 	private boolean useConferenceActivity;
@@ -442,7 +441,7 @@ public class DialerActivity extends Activity implements LinphoneGuiListener, Lin
 
 
 	public void onCallStateChanged(LinphoneCall call, State state, String message) {
-		Log.i("OnCallStateChanged: call=", call, ", state=", state, ", message=", message, ", currentCall=", mCurrentCall);
+		Log.i("OnCallStateChanged: call=", call, ", state=", state, ", message=", message);
 		LinphoneCore lc = LinphoneManager.getLcIfManagerNotDestroyedOrNull();
 		if (lc==null) {
 			/* we are certainly exiting, ignore then.*/
@@ -450,12 +449,10 @@ public class DialerActivity extends Activity implements LinphoneGuiListener, Lin
 		}
 		
 		if (state==LinphoneCall.State.OutgoingInit){
-			mCurrentCall=call;
 			call.enableCamera(LinphoneManager.getInstance().shareMyCamera());
 			enterIncallMode(lc);
 			LinphoneActivity.instance().startOrientationSensor();
 		}else if (state==LinphoneCall.State.IncomingReceived){
-			mCurrentCall=call;
 			callPending(call);
 			call.enableCamera(LinphoneManager.getInstance().shareMyCamera());
 			LinphoneActivity.instance().startOrientationSensor();
@@ -469,13 +466,11 @@ public class DialerActivity extends Activity implements LinphoneGuiListener, Lin
 				if (mWakeLock.isHeld()) mWakeLock.release();
 				exitCallMode();
 				LinphoneActivity.instance().stopOrientationSensor();
-				mCurrentCall=null;
 			}
 		}else if (state==LinphoneCall.State.CallEnd){
 			if (lc.getCallsNb() == 0){
 				exitCallMode();
 				LinphoneActivity.instance().stopOrientationSensor();
-				mCurrentCall=null;
 			}
 		}
 
diff --git a/submodules/externals/osip b/submodules/externals/osip
index c27b9b670..9e8c64cff 160000
--- a/submodules/externals/osip
+++ b/submodules/externals/osip
@@ -1 +1 @@
-Subproject commit c27b9b6702f62cdbd2143c1ccc85b8980b83adac
+Subproject commit 9e8c64cff496d2794fe352a6a3907e0e36988931
diff --git a/submodules/linphone b/submodules/linphone
index a0f8cbb73..e740628ab 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit a0f8cbb73c1c028182972147d1ce3f0fdae2921f
+Subproject commit e740628ab7cb69acae8751572506dfc840028607

From 7db742d55a5c071904a969c2351076e20a9aa45f Mon Sep 17 00:00:00 2001
From: Guillaume Beraudo <guillaume.beraudo@belledonne-communications.com>
Date: Mon, 17 Oct 2011 09:56:19 +0200
Subject: [PATCH 54/62] Change when to show add video button.

---
 src/org/linphone/ConferenceActivity.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/org/linphone/ConferenceActivity.java b/src/org/linphone/ConferenceActivity.java
index acba9ea0c..25f3daa8b 100644
--- a/src/org/linphone/ConferenceActivity.java
+++ b/src/org/linphone/ConferenceActivity.java
@@ -561,7 +561,7 @@ public class ConferenceActivity extends ListActivity implements
 			setVisibility(removeFromConfButton, false);
 			
 			final int numberOfCalls = linphoneCalls.size();
-			boolean showAddVideo = !isInConference && !showUnhook && numberOfCalls == 1
+			boolean showAddVideo = State.StreamsRunning == state && !isInConference
 					&& Version.isVideoCapable() && LinphoneManager.getInstance().isVideoEnabled();
 			setVisibility(v, R.id.addVideo, showAddVideo);
 

From ad73edbe001a43d501f8ae847c185b56cdb581ad Mon Sep 17 00:00:00 2001
From: Guillaume Beraudo <guillaume.beraudo@belledonne-communications.com>
Date: Mon, 17 Oct 2011 10:51:13 +0200
Subject: [PATCH 55/62] Fix partial sip uri displaying.

---
 res/values/custom.xml                      | 18 ----------------
 res/values/non_localizable_custom.xml      | 24 ++++++++++++++++++++++
 src/org/linphone/ConferenceActivity.java   |  6 ++----
 src/org/linphone/IncomingCallActivity.java |  2 +-
 4 files changed, 27 insertions(+), 23 deletions(-)
 create mode 100644 res/values/non_localizable_custom.xml

diff --git a/res/values/custom.xml b/res/values/custom.xml
index 9802a3127..0b975b0c4 100644
--- a/res/values/custom.xml
+++ b/res/values/custom.xml
@@ -3,27 +3,9 @@
 
 
 	<string name="app_name">Linphone</string>
-	<string name="default_domain">test.linphone.org</string>
-
-	<bool name="use_android_contact_picker">true</bool>
-    
-    <bool name="useFirstLoginActivity">false</bool>
-	<bool name="useMenuSettings">true</bool>
-	<bool name="useMenuAbout">true</bool>
-	<bool name="use_incall_activity">false</bool>
-	<bool name="use_conference_activity">true</bool>
-	<bool name="use_video_activity">true</bool>
-	<bool name="use_incoming_call_dialog">false</bool>
-	<bool name="use_incoming_call_activity">true</bool>
-	<bool name="show_full_remote_address_on_incoming_call">true</bool>
-
 	<string name="notification_title">Linphone</string>
-	<bool name="allow_edit_in_dialer">true</bool>
 	<string name="notification_registered">Registered to %s </string> 
 	<string name="notification_register_failure">Fails to register to %s</string>
-	<color name="conf_active_bg_color">#191970</color>
-
 	<string name="about_text">Linphone %s SIP (rfc 3261) compatible phone under GNU Public License V2\n http://www.linphone.org\n\nInstructions\nhttp://www.linphone.org/m/help\n\n© 2011 Belledonne Communications</string>
-	<string name="about_bugreport_email">linphone-android@belledonne-communications.com</string>
 </resources>
  
\ No newline at end of file
diff --git a/res/values/non_localizable_custom.xml b/res/values/non_localizable_custom.xml
new file mode 100644
index 000000000..68d828161
--- /dev/null
+++ b/res/values/non_localizable_custom.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+
+	<string name="default_domain">test.linphone.org</string>
+
+	<bool name="use_android_contact_picker">true</bool>
+    
+    <bool name="useFirstLoginActivity">false</bool>
+	<bool name="useMenuSettings">true</bool>
+	<bool name="useMenuAbout">true</bool>
+	<bool name="use_incall_activity">false</bool>
+	<bool name="use_conference_activity">true</bool>
+	<bool name="use_video_activity">true</bool>
+	<bool name="use_incoming_call_dialog">false</bool>
+	<bool name="use_incoming_call_activity">true</bool>
+	<bool name="show_full_remote_address_on_incoming_call">true</bool>
+
+	<bool name="allow_edit_in_dialer">true</bool>
+	<color name="conf_active_bg_color">#191970</color>
+
+	<string name="about_bugreport_email">linphone-android@belledonne-communications.com</string>
+</resources>
+ 
\ No newline at end of file
diff --git a/src/org/linphone/ConferenceActivity.java b/src/org/linphone/ConferenceActivity.java
index 25f3daa8b..270f2d7c4 100644
--- a/src/org/linphone/ConferenceActivity.java
+++ b/src/org/linphone/ConferenceActivity.java
@@ -497,11 +497,9 @@ public class ConferenceActivity extends ListActivity implements
 
 			LinphoneAddress address = call.getRemoteAddress();
 			String mainText = address.getDisplayName();
-			String complText;
+			String complText = address.getUserName();
 			if ((getResources().getBoolean(R.bool.show_full_remote_address_on_incoming_call))) {
-				complText = address.getUserName() + "@" + address.getDomain();
-			} else {
-				complText = address.getUserName();
+				complText += "@" + address.getDomain();
 			}
 			TextView mainTextView = (TextView) v.findViewById(R.id.name);
 			TextView complTextView = (TextView) v.findViewById(R.id.address);
diff --git a/src/org/linphone/IncomingCallActivity.java b/src/org/linphone/IncomingCallActivity.java
index e21727c60..ce1c2fe0a 100644
--- a/src/org/linphone/IncomingCallActivity.java
+++ b/src/org/linphone/IncomingCallActivity.java
@@ -112,7 +112,7 @@ public class IncomingCallActivity extends Activity implements LinphoneManagerRea
 		if (getResources().getBoolean(R.bool.show_full_remote_address_on_incoming_call)) {
 			mNumberView.setText(address.asStringUriOnly());
 		} else {
-			mNumberView.setText("");
+			mNumberView.setText(address.getUserName());
 		}
 	}
 

From 4a6ba5f8fdb2e8ad12add6cee69d353a4dd3a27f Mon Sep 17 00:00:00 2001
From: Guillaume Beraudo <guillaume.beraudo@belledonne-communications.com>
Date: Mon, 17 Oct 2011 15:48:02 +0200
Subject: [PATCH 56/62] Remove link to conference test in Android app list.

---
 AndroidManifest.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 79173267c..fcea8747d 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -134,7 +134,7 @@
 		<activity android:name="org.linphone.TestConferenceActivity"
                   android:label="Conf test"
                   android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
-                  android:enabled="true">
+                  android:enabled="false">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />

From 5fe6a522ba84e58828f5e189eeb8b7304e37f32b Mon Sep 17 00:00:00 2001
From: Guillaume Beraudo <guillaume.beraudo@belledonne-communications.com>
Date: Tue, 18 Oct 2011 10:10:24 +0200
Subject: [PATCH 57/62] Store and restore user requested audio route.

Go back to user requested route when going out of video activity.
---
 src/org/linphone/ConferenceActivity.java     | 37 ++++++++++-
 src/org/linphone/DialerActivity.java         |  9 +--
 src/org/linphone/LinphoneActivity.java       |  8 ++-
 src/org/linphone/LinphoneManager.java        | 70 +++++++++++++++-----
 src/org/linphone/LinphoneSimpleListener.java |  5 ++
 src/org/linphone/VideoCallActivity.java      |  6 +-
 src/org/linphone/ui/SpeakerButton.java       |  4 +-
 7 files changed, 108 insertions(+), 31 deletions(-)

diff --git a/src/org/linphone/ConferenceActivity.java b/src/org/linphone/ConferenceActivity.java
index 270f2d7c4..14e9c18a0 100644
--- a/src/org/linphone/ConferenceActivity.java
+++ b/src/org/linphone/ConferenceActivity.java
@@ -27,6 +27,7 @@ import java.util.Comparator;
 import java.util.List;
 
 import org.linphone.LinphoneManagerWaitHelper.LinphoneManagerReadyListener;
+import org.linphone.LinphoneSimpleListener.LinphoneAudioChangedListener;
 import org.linphone.LinphoneSimpleListener.LinphoneOnCallStateChangedListener;
 import org.linphone.core.LinphoneAddress;
 import org.linphone.core.LinphoneCall;
@@ -64,6 +65,7 @@ import android.widget.ToggleButton;
  */
 public class ConferenceActivity extends ListActivity implements
 		LinphoneManagerReadyListener,
+		LinphoneAudioChangedListener,
 		LinphoneOnCallStateChangedListener, Comparator<LinphoneCall>,
 		OnClickListener {
 
@@ -149,6 +151,10 @@ public class ConferenceActivity extends ListActivity implements
 		updateConfState();
 		updateSimpleControlButtons();
 		CalleeListAdapter adapter = (CalleeListAdapter) getListAdapter();
+		if (adapter.linphoneCalls.size() != lc().getCallsNb()) {
+			adapter.linphoneCalls.clear();
+			adapter.linphoneCalls.addAll(getInitialCalls());
+		}
 		adapter.notifyDataSetInvalidated();
 		adapter.notifyDataSetChanged();
 		LinphoneManager.startProximitySensorForActivity(this);
@@ -353,9 +359,9 @@ public class ConferenceActivity extends ListActivity implements
 			break;
 		case R.id.toggleSpeaker:
 			if (((ToggleButton) v).isChecked()) {
-				LinphoneManager.getInstance().routeAudioToSpeaker();
+				LinphoneManager.getInstance().routeAudioToSpeaker(true);
 			} else {
-				LinphoneManager.getInstance().routeAudioToReceiver();
+				LinphoneManager.getInstance().routeAudioToReceiver(true);
 			}
 			break;
 		default:
@@ -422,6 +428,10 @@ public class ConferenceActivity extends ListActivity implements
 			case R.id.remove_from_conference:
 				lc().removeFromConference(call);
 				break;
+			case R.id.addVideo:
+				VideoCallActivity.call = call;
+				LinphoneActivity.instance().startVideoActivity();
+				break;
 			default:
 				throw new RuntimeException("unknown id " + v.getId());
 			}
@@ -561,7 +571,8 @@ public class ConferenceActivity extends ListActivity implements
 			final int numberOfCalls = linphoneCalls.size();
 			boolean showAddVideo = State.StreamsRunning == state && !isInConference
 					&& Version.isVideoCapable() && LinphoneManager.getInstance().isVideoEnabled();
-			setVisibility(v, R.id.addVideo, showAddVideo);
+			View addVideoButton = v.findViewById(R.id.addVideo);
+			setVisibility(addVideoButton, showAddVideo);
 
 			boolean statusPaused = state== State.Paused || state == State.PausedByRemote;
 			setVisibility(v, R.id.callee_status_paused, statusPaused);
@@ -575,6 +586,7 @@ public class ConferenceActivity extends ListActivity implements
 			resumeButton.setOnClickListener(l);
 			unhookCallButton.setOnClickListener(l);
 			removeFromConfButton.setOnClickListener(l);
+			addVideoButton.setOnClickListener(l);
 
 			v.setOnClickListener(new OnClickListener() {
 				public void onClick(View v) {
@@ -749,6 +761,25 @@ public class ConferenceActivity extends ListActivity implements
 		return super.onKeyDown(keyCode, event);
 	}
 
+	@Override
+	public void onAudioStateChanged(final AudioState state) {
+		mSpeakerButton.post(new Runnable() {
+			@Override
+			public void run() {
+				switch (state) {
+				case SPEAKER:
+					mSpeakerButton.setChecked(true);
+					break;
+				case EARPIECE:
+					mSpeakerButton.setChecked(false);
+					break;
+				default:
+					throw new RuntimeException("Unkown audio state " + state);
+				}
+			}
+		});
+	}
+
 	/*
 	 * public int compare(LinphoneCall c1, LinphoneCall c2) { if (c1 == c2)
 	 * return 0;
diff --git a/src/org/linphone/DialerActivity.java b/src/org/linphone/DialerActivity.java
index 0ecfb3767..6bbd2a99d 100644
--- a/src/org/linphone/DialerActivity.java
+++ b/src/org/linphone/DialerActivity.java
@@ -288,7 +288,7 @@ public class DialerActivity extends Activity implements LinphoneGuiListener, Lin
 	}
 	
 	
-	private void exitCallMode() {
+	private void exitCallMode(LinphoneCall call) {
 		if (getResources().getBoolean(R.bool.use_incoming_call_activity)) {
 			finishActivity(INCOMING_CALL_ACTIVITY);
 		} else if (getResources().getBoolean(R.bool.use_incoming_call_dialog)) {
@@ -316,7 +316,8 @@ public class DialerActivity extends Activity implements LinphoneGuiListener, Lin
 		mHangup.setEnabled(false);
 
 
-		if (useVideoActivity && LinphoneManager.getLc().isVideoEnabled()) {
+		if (useVideoActivity && LinphoneManager.getLc().isVideoEnabled()
+				&& VideoCallActivity.call == call) {
 			LinphoneActivity.instance().finishVideoActivity(); 
 			BandwidthManager.getInstance().setUserRestriction(false);
 			LinphoneManager.getInstance().resetCameraFromPreferences();
@@ -464,12 +465,12 @@ public class DialerActivity extends Activity implements LinphoneGuiListener, Lin
 			showToast(R.string.call_error, message);
 			if (lc.getCallsNb() == 0){
 				if (mWakeLock.isHeld()) mWakeLock.release();
-				exitCallMode();
+				exitCallMode(call);
 				LinphoneActivity.instance().stopOrientationSensor();
 			}
 		}else if (state==LinphoneCall.State.CallEnd){
 			if (lc.getCallsNb() == 0){
-				exitCallMode();
+				exitCallMode(call);
 				LinphoneActivity.instance().stopOrientationSensor();
 			}
 		}
diff --git a/src/org/linphone/LinphoneActivity.java b/src/org/linphone/LinphoneActivity.java
index 62c89439e..faad7585a 100644
--- a/src/org/linphone/LinphoneActivity.java
+++ b/src/org/linphone/LinphoneActivity.java
@@ -256,8 +256,9 @@ public class LinphoneActivity extends TabActivity implements SensorEventListener
 		super.onPause();
 		
 		if  (isFinishing())  {
-			//restore audio settings   
-			LinphoneManager.getInstance().routeAudioToReceiver();
+			//restore audio settings
+			boolean isUserRequest = false;
+			LinphoneManager.getInstance().routeAudioToReceiver(isUserRequest);
 			LinphoneManager.stopProximitySensorForActivity(this);
 			instance = null;
 		}
@@ -469,7 +470,8 @@ public class LinphoneActivity extends TabActivity implements SensorEventListener
 						video_activity);
 				}
 		});
-		LinphoneManager.getInstance().routeAudioToSpeaker();
+		boolean isUserRequest = false;
+		LinphoneManager.getInstance().routeAudioToSpeaker(isUserRequest);
 	}
 
 	public void startConferenceActivity() {
diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java
index 941764eb2..067cb43f7 100644
--- a/src/org/linphone/LinphoneManager.java
+++ b/src/org/linphone/LinphoneManager.java
@@ -46,7 +46,9 @@ import java.util.Set;
 import java.util.Timer;
 import java.util.TimerTask;
 
+import org.linphone.LinphoneSimpleListener.LinphoneAudioChangedListener;
 import org.linphone.LinphoneSimpleListener.LinphoneServiceListener;
+import org.linphone.LinphoneSimpleListener.LinphoneAudioChangedListener.AudioState;
 import org.linphone.core.LinphoneAddress;
 import org.linphone.core.LinphoneAuthInfo;
 import org.linphone.core.LinphoneCall;
@@ -177,6 +179,12 @@ public final class LinphoneManager implements LinphoneCoreListener {
 		getInstance().routeAudioToSpeakerHelperHelper(speakerOn);
 	}
 	private void routeAudioToSpeakerHelperHelper(boolean speakerOn) {
+		boolean different = isSpeakerOn() ^ speakerOn;
+		if (!different) {
+			Log.d("Skipping change audio route by the same route ",
+					speakerOn ? "speaker" : "earpiece");
+			return;
+		}
 		if (Hacks.needGalaxySAudioHack() || lpm.useGalaxySHack())
 			setAudioModeIncallForGalaxyS();
 
@@ -191,6 +199,9 @@ public final class LinphoneManager implements LinphoneCoreListener {
 		} else {
 			mAudioManager.setSpeakerphoneOn(speakerOn); 
 		}
+		for (LinphoneAudioChangedListener listener : getSimpleListeners(LinphoneAudioChangedListener.class)) {
+			listener.onAudioStateChanged(speakerOn ? AudioState.SPEAKER : AudioState.EARPIECE);
+		}
 	}
 	private synchronized void routeAudioToSpeakerHelper(boolean speakerOn) {
 		final LinphoneCall call = mLc.getCurrentCall();
@@ -202,8 +213,24 @@ public final class LinphoneManager implements LinphoneCoreListener {
 		}
 	}
 
-	
-	public void routeAudioToSpeaker() {
+	private static boolean sUserRequestedSpeaker;
+	public static final boolean isUserRequestedSpeaker() {return sUserRequestedSpeaker;}
+
+	public void restoreUserRequestedSpeaker() {
+		if (sUserRequestedSpeaker) {
+			routeAudioToSpeaker(false);
+		} else {
+			routeAudioToReceiver(false);
+		}
+	}
+	/**
+	 * 
+	 * @param isUserRequest true if the setting is permanent, otherwise it can be lost
+	 * 	eg: video activity imply speaker on, which is not a request from the user.
+	 * 	when the activity stops, the sound is routed to the previously user requested route.
+	 */
+	public void routeAudioToSpeaker(boolean isUserRequest) {
+		if (isUserRequest) sUserRequestedSpeaker = true;
 		routeAudioToSpeakerHelper(true);
 		if (mLc.isIncall()) {
 			/*disable EC, it is not efficient enough on speaker mode due to bad quality of speakers and saturation*/  
@@ -214,7 +241,14 @@ public final class LinphoneManager implements LinphoneCoreListener {
 		
 	}
 
-	public void routeAudioToReceiver() {
+	/**
+	 * 
+	 * @param isUserRequest true if the setting is permanent, otherwise it can be lost
+	 * 	eg: video activity imply speaker on, which is not a request from the user.
+	 * 	when the activity stops, the sound is routed to the previously user requested route.
+	 */
+	public void routeAudioToReceiver(boolean isUserRequest) {
+		if (isUserRequest) sUserRequestedSpeaker = false;
 		routeAudioToSpeakerHelper(false);
 		if (mLc.isIncall()) {
 			//Restore default value
@@ -677,7 +711,7 @@ public final class LinphoneManager implements LinphoneCoreListener {
 		void onEcCalibrationStatus(EcCalibratorStatus status, int delayMs);
 	}
 
-	private ListenerDispatcher listenerDispatcher = new ListenerDispatcher(simpleListeners);
+	private ListenerDispatcher listenerDispatcher = new ListenerDispatcher();
 	private LinphoneCall ringingCall;
 
 	private MediaPlayer mRingerPlayer;
@@ -746,7 +780,6 @@ public final class LinphoneManager implements LinphoneCoreListener {
 		} else if (call == ringingCall && isRinging) { 
 			//previous state was ringing, so stop ringing
 			stopRinging();
-			routeAudioToReceiver();
 		}
 
 		if (state == CallEnd || state == Error) {
@@ -853,6 +886,8 @@ public final class LinphoneManager implements LinphoneCoreListener {
 
 		isRinging = false;
 		// You may need to call galaxys audio hack after this method
+		boolean isUserRequest = false;
+		routeAudioToReceiver(isUserRequest);
 	}
 
 	
@@ -1067,21 +1102,17 @@ public final class LinphoneManager implements LinphoneCoreListener {
 		return getLc();
 	}
 
-	private static class ListenerDispatcher implements LinphoneServiceListener {
-		private LinphoneServiceListener serviceListener;
-		List<LinphoneSimpleListener> simpleListeners;
-		public ListenerDispatcher(List<LinphoneSimpleListener> simpleListeners) {
-			this.simpleListeners = simpleListeners; // yes, really keeps a reference, not a copy
+	@SuppressWarnings("unchecked")
+	private <T> List<T> getSimpleListeners(Class<T> clazz) {
+		List<T> list = new ArrayList<T>();
+		for (LinphoneSimpleListener l : simpleListeners) {
+			if (clazz.isInstance(l)) list.add((T) l);
 		}
+		return list;
+	}
 
-		@SuppressWarnings("unchecked")
-		private <T> List<T> getSimpleListeners(Class<T> clazz) {
-			List<T> list = new ArrayList<T>();
-			for (LinphoneSimpleListener l : simpleListeners) {
-				if (clazz.isInstance(l)) list.add((T) l);
-			}
-			return list;
-		}
+	private class ListenerDispatcher implements LinphoneServiceListener {
+		private LinphoneServiceListener serviceListener;
 
 		public void setServiceListener(LinphoneServiceListener s) {
 			this.serviceListener = s;
@@ -1098,6 +1129,9 @@ public final class LinphoneManager implements LinphoneCoreListener {
 
 		public void onCallStateChanged(LinphoneCall call, State state,
 				String message) {
+			if (state == State.CallEnd && mLc.getCallsNb() == 0) {
+				routeAudioToReceiver(true);
+			}
 			if (serviceListener != null) serviceListener.onCallStateChanged(call, state, message);
 			for (LinphoneOnCallStateChangedListener l : getSimpleListeners(LinphoneOnCallStateChangedListener.class)) {
 				l.onCallStateChanged(call, state, message);
diff --git a/src/org/linphone/LinphoneSimpleListener.java b/src/org/linphone/LinphoneSimpleListener.java
index d64b2bb3b..5da9645f4 100644
--- a/src/org/linphone/LinphoneSimpleListener.java
+++ b/src/org/linphone/LinphoneSimpleListener.java
@@ -47,4 +47,9 @@ public interface LinphoneSimpleListener {
 	public static interface LinphoneOnCallStateChangedListener extends LinphoneSimpleListener {
 		void onCallStateChanged(LinphoneCall call, State state, String message);
 	}
+
+	public static interface LinphoneAudioChangedListener extends LinphoneSimpleListener {
+		public enum AudioState {EARPIECE, SPEAKER}
+		void onAudioStateChanged(AudioState state);
+	}
 }
diff --git a/src/org/linphone/VideoCallActivity.java b/src/org/linphone/VideoCallActivity.java
index de45c330c..dc1e32c45 100755
--- a/src/org/linphone/VideoCallActivity.java
+++ b/src/org/linphone/VideoCallActivity.java
@@ -50,6 +50,7 @@ public class VideoCallActivity extends Activity {
 	private SurfaceView mVideoViewReady;
 	private SurfaceView mVideoCaptureViewReady;
 	public static boolean launched = false;
+	public static LinphoneCall call;
 	private WakeLock mWakeLock;
 	private Handler refreshHandler = new Handler();
 	
@@ -280,7 +281,10 @@ public class VideoCallActivity extends Activity {
 	@Override
 	protected void onPause() {
 		Log.d("onPause VideoCallActivity (isFinishing:", isFinishing(), ", inCall:", LinphoneManager.getLc().isIncall(), ", changingConf:", getChangingConfigurations());
-		
+		if (isFinishing()) {
+			call = null; // release reference
+		}
+		LinphoneManager.getInstance().restoreUserRequestedSpeaker();
 		launched=false;
 		synchronized (androidVideoWindowImpl) {
 			/* this call will destroy native opengl renderer
diff --git a/src/org/linphone/ui/SpeakerButton.java b/src/org/linphone/ui/SpeakerButton.java
index 35d2beb1b..05b53867a 100644
--- a/src/org/linphone/ui/SpeakerButton.java
+++ b/src/org/linphone/ui/SpeakerButton.java
@@ -48,9 +48,9 @@ public class SpeakerButton extends ToggleImageButton implements OnCheckedChangeL
 
 	public void onCheckedChanged(ToggleImageButton button, boolean checked) {
 		if (checked) {
-			LinphoneManager.getInstance().routeAudioToSpeaker();
+			LinphoneManager.getInstance().routeAudioToSpeaker(true);
 		} else {
-			LinphoneManager.getInstance().routeAudioToReceiver();
+			LinphoneManager.getInstance().routeAudioToReceiver(true);
 		}
 	}
 

From 95e8740e388961b02167b64dfd8d32cec07e2c3a Mon Sep 17 00:00:00 2001
From: Guillaume Beraudo <guillaume.beraudo@belledonne-communications.com>
Date: Tue, 18 Oct 2011 12:04:55 +0200
Subject: [PATCH 58/62] Enhance concomitant video + conferencing.

---
 res/values/non_localizable_custom.xml        |  1 +
 res/values/strings.xml                       |  6 ++--
 src/org/linphone/ConferenceActivity.java     | 25 ++++++++++++----
 src/org/linphone/DialerActivity.java         | 18 +++---------
 src/org/linphone/LinphoneManager.java        | 25 ++++++++++++----
 src/org/linphone/LinphoneService.java        |  1 +
 src/org/linphone/LinphoneSimpleListener.java |  8 ++++--
 src/org/linphone/VideoCallActivity.java      | 30 ++++++++++++++------
 submodules/externals/osip                    |  2 +-
 submodules/linphone                          |  2 +-
 10 files changed, 76 insertions(+), 42 deletions(-)

diff --git a/res/values/non_localizable_custom.xml b/res/values/non_localizable_custom.xml
index 68d828161..6b6bd7947 100644
--- a/res/values/non_localizable_custom.xml
+++ b/res/values/non_localizable_custom.xml
@@ -12,6 +12,7 @@
 	<bool name="use_incall_activity">false</bool>
 	<bool name="use_conference_activity">true</bool>
 	<bool name="use_video_activity">true</bool>
+	<bool name="autostart_video_activity">false</bool>
 	<bool name="use_incoming_call_dialog">false</bool>
 	<bool name="use_incoming_call_activity">true</bool>
 	<bool name="show_full_remote_address_on_incoming_call">true</bool>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index c0a6e2af2..b533b1158 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -108,9 +108,9 @@
 	<string name="menu_videocall_terminate_call_title">Terminate call</string>
     <string name="pref_video_settings_title">Video settings</string>
     <string name="pref_video_automatically_share_my_video_title">Share my camera</string>
-    <string name="pref_video_automatically_share_my_video">Automatically send my camera on incoming calls</string>
-    <string name="pref_video_initiate_call_with_video_title">Initiate video calls</string>
-    <string name="pref_video_initiate_call_with_video">Always send my camera on outgoing calls</string>
+    <string name="pref_video_automatically_share_my_video">Send my camera on video capable calls</string>
+    <string name="pref_video_initiate_call_with_video_title">Initiate video capable calls</string>
+    <string name="pref_video_initiate_call_with_video">Disable to remove negotiation of video codecs for outgoing calls</string>
     <string name="pref_video_enable_title">Enable Video</string>
     <string name="pref_escape_plus">Replace + by 00</string>
     <string name="pref_ilbc_summary">iLBC might be unavailable depending on ARM processor and Android OS version.</string>
diff --git a/src/org/linphone/ConferenceActivity.java b/src/org/linphone/ConferenceActivity.java
index 14e9c18a0..8cc015a29 100644
--- a/src/org/linphone/ConferenceActivity.java
+++ b/src/org/linphone/ConferenceActivity.java
@@ -27,8 +27,9 @@ import java.util.Comparator;
 import java.util.List;
 
 import org.linphone.LinphoneManagerWaitHelper.LinphoneManagerReadyListener;
-import org.linphone.LinphoneSimpleListener.LinphoneAudioChangedListener;
+import org.linphone.LinphoneSimpleListener.LinphoneOnAudioChangedListener;
 import org.linphone.LinphoneSimpleListener.LinphoneOnCallStateChangedListener;
+import org.linphone.LinphoneSimpleListener.LinphoneOnVideoCallReadyListener;
 import org.linphone.core.LinphoneAddress;
 import org.linphone.core.LinphoneCall;
 import org.linphone.core.LinphoneCore;
@@ -65,8 +66,10 @@ import android.widget.ToggleButton;
  */
 public class ConferenceActivity extends ListActivity implements
 		LinphoneManagerReadyListener,
-		LinphoneAudioChangedListener,
-		LinphoneOnCallStateChangedListener, Comparator<LinphoneCall>,
+		LinphoneOnAudioChangedListener,
+		LinphoneOnVideoCallReadyListener,
+		LinphoneOnCallStateChangedListener,
+		Comparator<LinphoneCall>,
 		OnClickListener {
 
 	private View confHeaderView;
@@ -112,6 +115,9 @@ public class ConferenceActivity extends ListActivity implements
 	private LinphoneManagerWaitHelper waitHelper;
 	private ToggleButton mMuteMicButton;
 	private ToggleButton mSpeakerButton;
+	private boolean useVideoActivity;
+
+
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		setContentView(R.layout.conferencing);
@@ -133,6 +139,7 @@ public class ConferenceActivity extends ListActivity implements
 
 		waitHelper = new LinphoneManagerWaitHelper(this, this);
 		waitHelper.doManagerDependentOnCreate();
+		useVideoActivity = getResources().getBoolean(R.bool.use_video_activity);
 //		workaroundStatusBarBug();
 		super.onCreate(savedInstanceState);
 	}
@@ -429,8 +436,7 @@ public class ConferenceActivity extends ListActivity implements
 				lc().removeFromConference(call);
 				break;
 			case R.id.addVideo:
-				VideoCallActivity.call = call;
-				LinphoneActivity.instance().startVideoActivity();
+				LinphoneManager.getInstance().addVideo();
 				break;
 			default:
 				throw new RuntimeException("unknown id " + v.getId());
@@ -570,7 +576,9 @@ public class ConferenceActivity extends ListActivity implements
 			
 			final int numberOfCalls = linphoneCalls.size();
 			boolean showAddVideo = State.StreamsRunning == state && !isInConference
-					&& Version.isVideoCapable() && LinphoneManager.getInstance().isVideoEnabled();
+					&& useVideoActivity
+					&& Version.isVideoCapable()
+					&& LinphoneManager.getInstance().isVideoEnabled();
 			View addVideoButton = v.findViewById(R.id.addVideo);
 			setVisibility(addVideoButton, showAddVideo);
 
@@ -780,6 +788,11 @@ public class ConferenceActivity extends ListActivity implements
 		});
 	}
 
+	@Override
+	public void onRequestedVideoCallReady(LinphoneCall call) {
+		LinphoneActivity.instance().startVideoActivity();
+	}
+
 	/*
 	 * public int compare(LinphoneCall c1, LinphoneCall c2) { if (c1 == c2)
 	 * return 0;
diff --git a/src/org/linphone/DialerActivity.java b/src/org/linphone/DialerActivity.java
index 6bbd2a99d..6ab995e95 100644
--- a/src/org/linphone/DialerActivity.java
+++ b/src/org/linphone/DialerActivity.java
@@ -87,7 +87,6 @@ public class DialerActivity extends Activity implements LinphoneGuiListener, Lin
 	private PowerManager.WakeLock mWakeLock;
 	private SharedPreferences mPref;
 	private boolean useIncallActivity;
-	private boolean useVideoActivity;
 	private boolean useConferenceActivity;
 	
 	private static final String CURRENT_ADDRESS = "org.linphone.current-address"; 
@@ -109,7 +108,6 @@ public class DialerActivity extends Activity implements LinphoneGuiListener, Lin
 
 		useIncallActivity = getResources().getBoolean(R.bool.use_incall_activity);
 		useConferenceActivity = getResources().getBoolean(R.bool.use_conference_activity);
-		useVideoActivity = getResources().getBoolean(R.bool.use_video_activity);
 		// Don't use Linphone Manager in the onCreate as it takes time in LinphoneService to initialize it.
 
 		mPref = PreferenceManager.getDefaultSharedPreferences(this);
@@ -288,7 +286,7 @@ public class DialerActivity extends Activity implements LinphoneGuiListener, Lin
 	}
 	
 	
-	private void exitCallMode(LinphoneCall call) {
+	private void exitCallMode() {
 		if (getResources().getBoolean(R.bool.use_incoming_call_activity)) {
 			finishActivity(INCOMING_CALL_ACTIVITY);
 		} else if (getResources().getBoolean(R.bool.use_incoming_call_dialog)) {
@@ -315,14 +313,6 @@ public class DialerActivity extends Activity implements LinphoneGuiListener, Lin
 
 		mHangup.setEnabled(false);
 
-
-		if (useVideoActivity && LinphoneManager.getLc().isVideoEnabled()
-				&& VideoCallActivity.call == call) {
-			LinphoneActivity.instance().finishVideoActivity(); 
-			BandwidthManager.getInstance().setUserRestriction(false);
-			LinphoneManager.getInstance().resetCameraFromPreferences();
-		}
-
 		if (mWakeLock.isHeld()) mWakeLock.release();
 		LinphoneManager.stopProximitySensorForActivity(LinphoneActivity.instance());
 		
@@ -377,7 +367,7 @@ public class DialerActivity extends Activity implements LinphoneGuiListener, Lin
 						boolean prefAutoShareMyCamera = mPref.getBoolean(getString(key), false);
 						boolean videoMuted = !(prefVideoEnable && prefAutoShareMyCamera);
 
-						LinphoneManager.getLc().getCurrentCall().enableCamera(prefAutoShareMyCamera);
+						LinphoneManager.getLc().getCurrentCall().enableCamera(!(videoMuted || useConferenceActivity));
 					}
 				}
 			});
@@ -465,12 +455,12 @@ public class DialerActivity extends Activity implements LinphoneGuiListener, Lin
 			showToast(R.string.call_error, message);
 			if (lc.getCallsNb() == 0){
 				if (mWakeLock.isHeld()) mWakeLock.release();
-				exitCallMode(call);
+				exitCallMode();
 				LinphoneActivity.instance().stopOrientationSensor();
 			}
 		}else if (state==LinphoneCall.State.CallEnd){
 			if (lc.getCallsNb() == 0){
-				exitCallMode(call);
+				exitCallMode();
 				LinphoneActivity.instance().stopOrientationSensor();
 			}
 		}
diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java
index 067cb43f7..75542502b 100644
--- a/src/org/linphone/LinphoneManager.java
+++ b/src/org/linphone/LinphoneManager.java
@@ -46,9 +46,9 @@ import java.util.Set;
 import java.util.Timer;
 import java.util.TimerTask;
 
-import org.linphone.LinphoneSimpleListener.LinphoneAudioChangedListener;
+import org.linphone.LinphoneSimpleListener.LinphoneOnAudioChangedListener;
 import org.linphone.LinphoneSimpleListener.LinphoneServiceListener;
-import org.linphone.LinphoneSimpleListener.LinphoneAudioChangedListener.AudioState;
+import org.linphone.LinphoneSimpleListener.LinphoneOnAudioChangedListener.AudioState;
 import org.linphone.core.LinphoneAddress;
 import org.linphone.core.LinphoneAuthInfo;
 import org.linphone.core.LinphoneCall;
@@ -199,7 +199,7 @@ public final class LinphoneManager implements LinphoneCoreListener {
 		} else {
 			mAudioManager.setSpeakerphoneOn(speakerOn); 
 		}
-		for (LinphoneAudioChangedListener listener : getSimpleListeners(LinphoneAudioChangedListener.class)) {
+		for (LinphoneOnAudioChangedListener listener : getSimpleListeners(LinphoneOnAudioChangedListener.class)) {
 			listener.onAudioStateChanged(speakerOn ? AudioState.SPEAKER : AudioState.EARPIECE);
 		}
 	}
@@ -917,7 +917,7 @@ public final class LinphoneManager implements LinphoneCoreListener {
 	}
 	
 	public boolean shareMyCamera() {
-		return mPref.getBoolean(getString(R.string.pref_video_automatically_share_my_video_key), false);
+		return isVideoEnabled() && mPref.getBoolean(getString(R.string.pref_video_automatically_share_my_video_key), false);
 	}
 
 	public void setAudioModeIncallForGalaxyS() {
@@ -953,11 +953,15 @@ public final class LinphoneManager implements LinphoneCoreListener {
 		e.commit();
 	}
 
-	public void addVideo() {
-		if (!LinphoneManager.getLc().isIncall()) return;
+	private LinphoneCall requestedVideoCall;
+	public boolean addVideo() {
+		requestedVideoCall = mLc.getCurrentCall();
+		if (requestedVideoCall == null) return false;
+
 		if (!reinviteWithVideo()) {
 			listenerDispatcher.onAlreadyInVideoCall();
 		}
+		return true;
 	}
 	
 	public boolean acceptCallIfIncomingPending() throws LinphoneCoreException {
@@ -1129,9 +1133,18 @@ public final class LinphoneManager implements LinphoneCoreListener {
 
 		public void onCallStateChanged(LinphoneCall call, State state,
 				String message) {
+			if (state == State.CallEnd && call == requestedVideoCall) {
+				requestedVideoCall = null; // drop reference
+			}
 			if (state == State.CallEnd && mLc.getCallsNb() == 0) {
 				routeAudioToReceiver(true);
 			}
+			if (state == State.StreamsRunning && call == requestedVideoCall && call.getCurrentParamsCopy().getVideoEnabled()) {
+				for (LinphoneOnVideoCallReadyListener l : getSimpleListeners(LinphoneOnVideoCallReadyListener.class)) {
+					l.onRequestedVideoCallReady(call);
+				}
+				requestedVideoCall = null;
+			}
 			if (serviceListener != null) serviceListener.onCallStateChanged(call, state, message);
 			for (LinphoneOnCallStateChangedListener l : getSimpleListeners(LinphoneOnCallStateChangedListener.class)) {
 				l.onCallStateChanged(call, state, message);
diff --git a/src/org/linphone/LinphoneService.java b/src/org/linphone/LinphoneService.java
index d6fb3bc74..ad98417aa 100644
--- a/src/org/linphone/LinphoneService.java
+++ b/src/org/linphone/LinphoneService.java
@@ -342,6 +342,7 @@ public final class LinphoneService extends Service implements LinphoneServiceLis
 					.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
 		} else if (state == LinphoneCall.State.StreamsRunning) {
 			if (Version.isVideoCapable() 
+					&& getResources().getBoolean(R.bool.autostart_video_activity)
 					&& getResources().getBoolean(R.bool.use_video_activity)
 					&& !VideoCallActivity.launched && LinphoneActivity.isInstanciated()
 					&& call.getCurrentParamsCopy().getVideoEnabled()) {
diff --git a/src/org/linphone/LinphoneSimpleListener.java b/src/org/linphone/LinphoneSimpleListener.java
index 5da9645f4..20439db92 100644
--- a/src/org/linphone/LinphoneSimpleListener.java
+++ b/src/org/linphone/LinphoneSimpleListener.java
@@ -35,8 +35,8 @@ public interface LinphoneSimpleListener {
 		void onRegistrationStateChanged(RegistrationState state, String message);
 		void onRingerPlayerCreated(MediaPlayer mRingerPlayer);
 		void onDisplayStatus(String message);
-		void onAlreadyInVideoCall();
 		void onCallEncryptionChanged(LinphoneCall call, boolean encrypted, String authenticationToken);
+		void onAlreadyInVideoCall();
 		
 	}
 	
@@ -48,8 +48,12 @@ public interface LinphoneSimpleListener {
 		void onCallStateChanged(LinphoneCall call, State state, String message);
 	}
 
-	public static interface LinphoneAudioChangedListener extends LinphoneSimpleListener {
+	public static interface LinphoneOnAudioChangedListener extends LinphoneSimpleListener {
 		public enum AudioState {EARPIECE, SPEAKER}
 		void onAudioStateChanged(AudioState state);
 	}
+
+	public static interface LinphoneOnVideoCallReadyListener extends LinphoneSimpleListener {
+		void onRequestedVideoCallReady(LinphoneCall call);
+	}
 }
diff --git a/src/org/linphone/VideoCallActivity.java b/src/org/linphone/VideoCallActivity.java
index dc1e32c45..96cd6882b 100755
--- a/src/org/linphone/VideoCallActivity.java
+++ b/src/org/linphone/VideoCallActivity.java
@@ -20,8 +20,10 @@ package org.linphone;
 
 
 
+import org.linphone.LinphoneSimpleListener.LinphoneOnCallStateChangedListener;
 import org.linphone.core.LinphoneCall;
 import org.linphone.core.Log;
+import org.linphone.core.LinphoneCall.State;
 import org.linphone.mediastream.video.AndroidVideoWindowImpl;
 import org.linphone.mediastream.video.capture.hwconf.AndroidCameraConfiguration;
 
@@ -46,11 +48,11 @@ import android.widget.ImageView;
  * @author Guillaume Beraudo
  *
  */
-public class VideoCallActivity extends Activity {
+public class VideoCallActivity extends Activity implements LinphoneOnCallStateChangedListener {
 	private SurfaceView mVideoViewReady;
 	private SurfaceView mVideoCaptureViewReady;
 	public static boolean launched = false;
-	public static LinphoneCall call;
+	private LinphoneCall videoCall;
 	private WakeLock mWakeLock;
 	private Handler refreshHandler = new Handler();
 	
@@ -106,13 +108,11 @@ public class VideoCallActivity extends Activity {
 		// Before creating the graph, the orientation must be known to LC => this is done here
 		LinphoneManager.getLc().setDeviceRotation(AndroidVideoWindowImpl.rotationToAngle(getWindowManager().getDefaultDisplay().getOrientation()));
 
-		if (LinphoneManager.getLc().isIncall()) {
-			LinphoneCall call = LinphoneManager.getLc().getCurrentCall();
-			if (call != null) {
-				updatePreview(call.cameraEnabled());
-			}
+		videoCall = LinphoneManager.getLc().getCurrentCall();
+		if (videoCall != null) {
+			updatePreview(videoCall.cameraEnabled());
 		}
-		
+
 			
 		PowerManager pm = (PowerManager)getSystemService(Context.POWER_SERVICE);
 		mWakeLock = pm.newWakeLock(PowerManager.SCREEN_BRIGHT_WAKE_LOCK|PowerManager.ON_AFTER_RELEASE,Log.TAG);
@@ -169,6 +169,7 @@ public class VideoCallActivity extends Activity {
 		if (mVideoViewReady != null)
 			((GLSurfaceView)mVideoViewReady).onResume();
 		launched=true;
+		LinphoneManager.getInstance().addListener(this);
 		refreshHandler.postDelayed(mCallQualityUpdater=new Runnable(){
 			LinphoneCall mCurrentCall=LinphoneManager.getLc().getCurrentCall();
 			public void run() {
@@ -281,8 +282,9 @@ public class VideoCallActivity extends Activity {
 	@Override
 	protected void onPause() {
 		Log.d("onPause VideoCallActivity (isFinishing:", isFinishing(), ", inCall:", LinphoneManager.getLc().isIncall(), ", changingConf:", getChangingConfigurations());
+		LinphoneManager.getInstance().removeListener(this);
 		if (isFinishing()) {
-			call = null; // release reference
+			videoCall = null; // release reference
 		}
 		LinphoneManager.getInstance().restoreUserRequestedSpeaker();
 		launched=false;
@@ -314,4 +316,14 @@ public class VideoCallActivity extends Activity {
 		if (mVideoViewReady != null)
 			((GLSurfaceView)mVideoViewReady).onPause();
 	}
+
+	@Override
+	public void onCallStateChanged(LinphoneCall call, State state,
+			String message) {
+		if (call == videoCall && state == State.CallEnd) {
+			BandwidthManager.getInstance().setUserRestriction(false);
+			LinphoneManager.getInstance().resetCameraFromPreferences();
+			finish();
+		}
+	}
 }
diff --git a/submodules/externals/osip b/submodules/externals/osip
index 9e8c64cff..c27b9b670 160000
--- a/submodules/externals/osip
+++ b/submodules/externals/osip
@@ -1 +1 @@
-Subproject commit 9e8c64cff496d2794fe352a6a3907e0e36988931
+Subproject commit c27b9b6702f62cdbd2143c1ccc85b8980b83adac
diff --git a/submodules/linphone b/submodules/linphone
index e740628ab..67daaaa14 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit e740628ab7cb69acae8751572506dfc840028607
+Subproject commit 67daaaa14d1d6ec4322f54c43a372fa51ee312de

From c4838ad1fa8bb3e03eb9df7218400eb9857dea80 Mon Sep 17 00:00:00 2001
From: Guillaume Beraudo <guillaume.beraudo@belledonne-communications.com>
Date: Tue, 18 Oct 2011 15:44:35 +0200
Subject: [PATCH 59/62] Ability to limit number of calls / hide transfers.

---
 res/values/non_localizable_custom.xml         |  6 +-
 src/org/linphone/ConferenceActivity.java      | 57 ++++++++++++-------
 src/org/linphone/LinphoneService.java         |  2 +-
 src/org/linphone/core/LinphoneCoreImpl.java   |  5 ++
 submodules/linphone                           |  2 +-
 test/org/linphone/TestConferenceActivity.java |  4 ++
 6 files changed, 53 insertions(+), 23 deletions(-)

diff --git a/res/values/non_localizable_custom.xml b/res/values/non_localizable_custom.xml
index 6b6bd7947..626e4ebe2 100644
--- a/res/values/non_localizable_custom.xml
+++ b/res/values/non_localizable_custom.xml
@@ -6,7 +6,7 @@
 
 	<bool name="use_android_contact_picker">true</bool>
     
-    <bool name="useFirstLoginActivity">false</bool>
+	<bool name="useFirstLoginActivity">false</bool>
 	<bool name="useMenuSettings">true</bool>
 	<bool name="useMenuAbout">true</bool>
 	<bool name="use_incall_activity">false</bool>
@@ -17,9 +17,11 @@
 	<bool name="use_incoming_call_activity">true</bool>
 	<bool name="show_full_remote_address_on_incoming_call">true</bool>
 
+	<bool name="allow_transfers">true</bool>
+
 	<bool name="allow_edit_in_dialer">true</bool>
 	<color name="conf_active_bg_color">#191970</color>
 
 	<string name="about_bugreport_email">linphone-android@belledonne-communications.com</string>
 </resources>
- 
\ No newline at end of file
+ 
diff --git a/src/org/linphone/ConferenceActivity.java b/src/org/linphone/ConferenceActivity.java
index 8cc015a29..938703180 100644
--- a/src/org/linphone/ConferenceActivity.java
+++ b/src/org/linphone/ConferenceActivity.java
@@ -116,12 +116,15 @@ public class ConferenceActivity extends ListActivity implements
 	private ToggleButton mMuteMicButton;
 	private ToggleButton mSpeakerButton;
 	private boolean useVideoActivity;
-
+	private int multipleCallsLimit;
+	private boolean allowTransfers;
 
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		setContentView(R.layout.conferencing);
 
+		allowTransfers = getResources().getBoolean(R.bool.allow_transfers);
+
 		confHeaderView = findViewById(R.id.conf_header);
 		confHeaderView.setOnClickListener(this);
 
@@ -129,7 +132,11 @@ public class ConferenceActivity extends ListActivity implements
 
 		findViewById(R.id.incallNumpadShow).setOnClickListener(this);
 		findViewById(R.id.conf_simple_merge).setOnClickListener(this);
-		findViewById(R.id.conf_simple_transfer).setOnClickListener(this);
+		View transferView = findViewById(R.id.conf_simple_transfer);
+		transferView.setOnClickListener(this);
+		if (!allowTransfers) {
+			transferView.setVisibility(View.GONE);
+		}
 		findViewById(R.id.conf_simple_permute).setOnClickListener(this);
 
 		mMuteMicButton = (ToggleButton) findViewById(R.id.toggleMuteMic);
@@ -140,6 +147,7 @@ public class ConferenceActivity extends ListActivity implements
 		waitHelper = new LinphoneManagerWaitHelper(this, this);
 		waitHelper.doManagerDependentOnCreate();
 		useVideoActivity = getResources().getBoolean(R.bool.use_video_activity);
+
 //		workaroundStatusBarBug();
 		super.onCreate(savedInstanceState);
 	}
@@ -150,6 +158,7 @@ public class ConferenceActivity extends ListActivity implements
 		setListAdapter(new CalleeListAdapter(calls));
 		
 		findViewById(R.id.incallHang).setOnClickListener(this);
+		multipleCallsLimit = lc().getMaxCalls();
 	}
 	@Override
 	public void onResumeWhenManagerReady() {
@@ -162,11 +171,19 @@ public class ConferenceActivity extends ListActivity implements
 			adapter.linphoneCalls.clear();
 			adapter.linphoneCalls.addAll(getInitialCalls());
 		}
-		adapter.notifyDataSetInvalidated();
-		adapter.notifyDataSetChanged();
+		recreateActivity(adapter);
 		LinphoneManager.startProximitySensorForActivity(this);
 		mSpeakerButton.setChecked(LinphoneManager.getInstance().isSpeakerOn());
 		mMuteMicButton.setChecked(LinphoneManager.getLc().isMicMuted());
+
+		if (multipleCallsLimit > 0) {
+			updateAddCallButton();
+		}
+	}
+
+	private void updateAddCallButton() {
+		boolean limitReached = lc().getCallsNb() >= multipleCallsLimit;
+		findViewById(R.id.addCall).setVisibility(limitReached ? GONE : VISIBLE);
 	}
 
 	@Override
@@ -464,8 +481,9 @@ public class ConferenceActivity extends ListActivity implements
 		}
 
 		private boolean aConferenceIsPossible() {
-			if (lc().getCallsNb() < 2)
+			if (lc().getCallsNb() < 2) {
 				return false;
+			}
 			int count = 0;
 			for (LinphoneCall call : linphoneCalls) {
 				final LinphoneCall.State state = call.getState();
@@ -595,14 +613,14 @@ public class ConferenceActivity extends ListActivity implements
 			unhookCallButton.setOnClickListener(l);
 			removeFromConfButton.setOnClickListener(l);
 			addVideoButton.setOnClickListener(l);
-
+			
 			v.setOnClickListener(new OnClickListener() {
 				public void onClick(View v) {
 					View content = getLayoutInflater().inflate(R.layout.conf_choices_dialog, null);
 					Dialog dialog = new AlertDialog.Builder(ConferenceActivity.this).setView(content).create();
 					OnClickListener l = new CallActionListener(call, dialog);
-					enableView(content, R.id.transfer_existing, l, !isInConference && numberOfCalls >=2);
-					enableView(content, R.id.transfer_new, l, !isInConference);
+					enableView(content, R.id.transfer_existing, l, allowTransfers && !isInConference && numberOfCalls >=2);
+					enableView(content, R.id.transfer_new, l, allowTransfers && !isInConference);
 					enableView(content, R.id.remove_from_conference, l, isInConference);
 					enableView(content, R.id.merge_to_conference, l, showMergeToConf);
 					enableView(content, R.id.pause, l,!isInConference && showPause);
@@ -665,23 +683,19 @@ public class ConferenceActivity extends ListActivity implements
 				if (state == State.IncomingReceived || state == State.OutgoingRinging) {
 					if (!adapter.linphoneCalls.contains(call)) {
 						adapter.linphoneCalls.add(call);
-						Collections.sort(adapter.linphoneCalls,
-								ConferenceActivity.this);
-						adapter.notifyDataSetInvalidated();
-						adapter.notifyDataSetChanged();
+						Collections.sort(adapter.linphoneCalls,	ConferenceActivity.this);
+						recreateActivity(adapter);
 					} else {
-						Log.e("Call should not be in the call lists : " + stateStr);
+						Log.e("Call should not be in the call lists : ", stateStr);
 					}
 				} else if (state == State.Paused || state == State.PausedByRemote || state == State.StreamsRunning) {
-					Collections.sort(adapter.linphoneCalls,
-							ConferenceActivity.this);
+					Collections.sort(adapter.linphoneCalls,	ConferenceActivity.this);
 					adapter.notifyDataSetChanged();
 				} else if (state == State.CallEnd) {
 					adapter.linphoneCalls.remove(call);
-					Collections.sort(adapter.linphoneCalls,
-							ConferenceActivity.this);
-					adapter.notifyDataSetInvalidated();
-					adapter.notifyDataSetChanged();
+					Collections.sort(adapter.linphoneCalls, ConferenceActivity.this);
+					updateAddCallButton();
+					recreateActivity(adapter);
 				}
 
 				updateConfState();
@@ -689,6 +703,11 @@ public class ConferenceActivity extends ListActivity implements
 		});
 	}
 
+	private void recreateActivity(CalleeListAdapter adapter) {
+		adapter.notifyDataSetInvalidated();
+		adapter.notifyDataSetChanged();
+	}
+
 	public int compare(LinphoneCall c1, LinphoneCall c2) {
 		if (c1 == c2)
 			return 0;
diff --git a/src/org/linphone/LinphoneService.java b/src/org/linphone/LinphoneService.java
index ad98417aa..f34718c9d 100644
--- a/src/org/linphone/LinphoneService.java
+++ b/src/org/linphone/LinphoneService.java
@@ -123,7 +123,7 @@ public final class LinphoneService extends Service implements LinphoneServiceLis
 		Intent notifIntent = new Intent(this, LinphoneActivity.class);
 		mNotifContentIntent = PendingIntent.getActivity(this, 0, notifIntent, 0);
 		mNotif.setLatestEventInfo(this, notificationTitle,"", mNotifContentIntent);
-	
+
 		LinphoneManager.createAndStart(this, this);
 		LinphoneManager.getLc().setPresenceInfo(0, null, OnlineStatus.Online);
 		instance = this; // instance is ready once linphone manager has been created
diff --git a/src/org/linphone/core/LinphoneCoreImpl.java b/src/org/linphone/core/LinphoneCoreImpl.java
index 139e1a30f..b2a26a976 100644
--- a/src/org/linphone/core/LinphoneCoreImpl.java
+++ b/src/org/linphone/core/LinphoneCoreImpl.java
@@ -583,4 +583,9 @@ class LinphoneCoreImpl implements LinphoneCore {
 	public void setMediaEncryptionMandatory(boolean yesno) {
 		setMediaEncryptionMandatory(nativePtr, yesno);
 	}
+
+	private native int getMaxCalls(long nativePtr);
+	public int getMaxCalls() {
+		return getMaxCalls(nativePtr);
+	}
 }
diff --git a/submodules/linphone b/submodules/linphone
index 67daaaa14..324551708 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 67daaaa14d1d6ec4322f54c43a372fa51ee312de
+Subproject commit 324551708e89dde781dc93a1eeae05532c8717f8
diff --git a/test/org/linphone/TestConferenceActivity.java b/test/org/linphone/TestConferenceActivity.java
index a7cb40db0..31fd3a971 100644
--- a/test/org/linphone/TestConferenceActivity.java
+++ b/test/org/linphone/TestConferenceActivity.java
@@ -320,6 +320,10 @@ public class TestConferenceActivity extends ConferenceActivity {
 			}
 			return null;
 		}
+		@Override
+		public int getMaxCalls() {
+			return 10;
+		}
 	}
 
 

From 353ef0cf3708765930d7a07bf345e97c8607eded Mon Sep 17 00:00:00 2001
From: Guillaume Beraudo <guillaume.beraudo@belledonne-communications.com>
Date: Tue, 18 Oct 2011 16:13:34 +0200
Subject: [PATCH 60/62] Reject incoming sip calls when using GSM.

---
 src/org/linphone/LinphoneManager.java           |  8 +++++++-
 src/org/linphone/PhoneStateChangedReceiver.java | 13 +++++++++++--
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java
index 75542502b..0518daa4f 100644
--- a/src/org/linphone/LinphoneManager.java
+++ b/src/org/linphone/LinphoneManager.java
@@ -96,6 +96,7 @@ import android.os.PowerManager.WakeLock;
 import android.preference.PreferenceManager;
 import android.provider.Settings;
 import android.provider.Settings.SettingNotFoundException;
+import android.telephony.TelephonyManager;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.Window;
@@ -158,6 +159,8 @@ public final class LinphoneManager implements LinphoneCoreListener {
 		mPref = PreferenceManager.getDefaultSharedPreferences(c);
 		mPowerManager = (PowerManager) c.getSystemService(Context.POWER_SERVICE);
 		mR = c.getResources();
+		TelephonyManager tm = (TelephonyManager) c.getSystemService(Context.TELEPHONY_SERVICE);
+		gsmIdle = tm.getCallState() == TelephonyManager.CALL_STATE_IDLE;
 	}
 	
 	private static final int LINPHONE_VOLUME_STREAM = STREAM_VOICE_CALL;
@@ -752,7 +755,7 @@ public final class LinphoneManager implements LinphoneCoreListener {
 		listenerDispatcher.onRegistrationStateChanged(state, message);
 	}
 
-
+	public static boolean gsmIdle;
 	public void callState(final LinphoneCore lc,final LinphoneCall call, final State state, final String message) {
 		Log.i("new state [",state,"]");
 		if (state == IncomingReceived && !call.equals(lc.getCurrentCall())) {
@@ -764,6 +767,9 @@ public final class LinphoneManager implements LinphoneCoreListener {
 		}
 
 		if (state == IncomingReceived) {
+			if (!gsmIdle) {
+				mLc.terminateCall(call);
+			}
 			// Brighten screen for at least 10 seconds
 			WakeLock wl = mPowerManager.newWakeLock(
 					PowerManager.ACQUIRE_CAUSES_WAKEUP
diff --git a/src/org/linphone/PhoneStateChangedReceiver.java b/src/org/linphone/PhoneStateChangedReceiver.java
index c5125faa0..b715cc2d3 100644
--- a/src/org/linphone/PhoneStateChangedReceiver.java
+++ b/src/org/linphone/PhoneStateChangedReceiver.java
@@ -18,6 +18,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 package org.linphone;
 
+import org.linphone.core.Log;
+
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -33,15 +35,22 @@ public class PhoneStateChangedReceiver extends BroadcastReceiver {
 
 	@Override
 	public void onReceive(Context context, Intent intent) {
+
+
 		final String extraState = intent.getStringExtra(TelephonyManager.EXTRA_STATE);
 
 		if (TelephonyManager.EXTRA_STATE_RINGING.equals(extraState) || TelephonyManager.EXTRA_STATE_OFFHOOK.equals(extraState)) {
+			LinphoneManager.gsmIdle = false;
 			if (LinphoneManager.isInstanciated()) {
-				LinphoneManager.getLc().pauseAllCalls();
+				Log.i("GSM call state changed but manager not instantiated");
+				return;
 			}
+			LinphoneManager.getLc().pauseAllCalls();
+        } else if (TelephonyManager.EXTRA_STATE_IDLE.equals(extraState)) {
+        	LinphoneManager.gsmIdle = true;
         }
 		
-		// TelephonyManager.EXTRA_STATE_IDLE.equals(extraState)
+		 
 		// do nothing
 	}
 

From 6b52e92224629597f18faffc0f608b73c1a2f316 Mon Sep 17 00:00:00 2001
From: Guillaume Beraudo <guillaume.beraudo@belledonne-communications.com>
Date: Thu, 20 Oct 2011 08:57:56 +0200
Subject: [PATCH 61/62] Remove incoming call dialog (use activity instead)

---
 res/values/non_localizable_custom.xml |  2 -
 src/org/linphone/DialerActivity.java  | 76 +++------------------------
 2 files changed, 8 insertions(+), 70 deletions(-)

diff --git a/res/values/non_localizable_custom.xml b/res/values/non_localizable_custom.xml
index 626e4ebe2..2f7d968bf 100644
--- a/res/values/non_localizable_custom.xml
+++ b/res/values/non_localizable_custom.xml
@@ -13,8 +13,6 @@
 	<bool name="use_conference_activity">true</bool>
 	<bool name="use_video_activity">true</bool>
 	<bool name="autostart_video_activity">false</bool>
-	<bool name="use_incoming_call_dialog">false</bool>
-	<bool name="use_incoming_call_activity">true</bool>
 	<bool name="show_full_remote_address_on_incoming_call">true</bool>
 
 	<bool name="allow_transfers">true</bool>
diff --git a/src/org/linphone/DialerActivity.java b/src/org/linphone/DialerActivity.java
index 6ab995e95..907265d56 100644
--- a/src/org/linphone/DialerActivity.java
+++ b/src/org/linphone/DialerActivity.java
@@ -27,7 +27,6 @@ import org.linphone.core.LinphoneCall;
 import org.linphone.core.LinphoneCore;
 import org.linphone.core.Log;
 import org.linphone.core.LinphoneCall.State;
-import org.linphone.mediastream.Version;
 import org.linphone.ui.AddVideoButton;
 import org.linphone.ui.AddressAware;
 import org.linphone.ui.AddressText;
@@ -38,16 +37,13 @@ import org.linphone.ui.MuteMicButton;
 import org.linphone.ui.SpeakerButton;
 
 import android.app.Activity;
-import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.Context;
 import android.content.Intent;
-import android.content.SharedPreferences;
 import android.media.AudioManager;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.PowerManager;
-import android.preference.PreferenceManager;
 import android.view.KeyEvent;
 import android.view.View;
 import android.view.View.OnClickListener;
@@ -85,14 +81,12 @@ public class DialerActivity extends Activity implements LinphoneGuiListener, Lin
 	private static DialerActivity instance;
 	
 	private PowerManager.WakeLock mWakeLock;
-	private SharedPreferences mPref;
 	private boolean useIncallActivity;
 	private boolean useConferenceActivity;
 	
 	private static final String CURRENT_ADDRESS = "org.linphone.current-address"; 
 	private static final String CURRENT_DISPLAYNAME = "org.linphone.current-displayname";
 
-	private static final int incomingCallDialogId = 1;
 	private static final int INCOMING_CALL_ACTIVITY = 10;
 
 	/**
@@ -110,9 +104,8 @@ public class DialerActivity extends Activity implements LinphoneGuiListener, Lin
 		useConferenceActivity = getResources().getBoolean(R.bool.use_conference_activity);
 		// Don't use Linphone Manager in the onCreate as it takes time in LinphoneService to initialize it.
 
-		mPref = PreferenceManager.getDefaultSharedPreferences(this);
-		PowerManager pm = (PowerManager)getSystemService(Context.POWER_SERVICE);
-		mWakeLock = pm.newWakeLock(PowerManager.SCREEN_DIM_WAKE_LOCK|PowerManager.ON_AFTER_RELEASE,Log.TAG);
+		PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE);
+		mWakeLock = pm.newWakeLock(PowerManager.SCREEN_DIM_WAKE_LOCK|PowerManager.ON_AFTER_RELEASE,Log.TAG+"#"+getClass().getName());
 
 
 		mAddress = (AddressText) findViewById(R.id.SipUri); 
@@ -287,15 +280,7 @@ public class DialerActivity extends Activity implements LinphoneGuiListener, Lin
 	
 	
 	private void exitCallMode() {
-		if (getResources().getBoolean(R.bool.use_incoming_call_activity)) {
-			finishActivity(INCOMING_CALL_ACTIVITY);
-		} else if (getResources().getBoolean(R.bool.use_incoming_call_dialog)) {
-			// Remove dialog if existing
-			try {
-				dismissDialog(incomingCallDialogId);
-			} catch (Throwable e) {/* Exception if never created */}
-		}
-		
+		finishActivity(INCOMING_CALL_ACTIVITY);
 
 		if (useIncallActivity) {
 			LinphoneActivity.instance().closeIncallActivity();
@@ -322,61 +307,16 @@ public class DialerActivity extends Activity implements LinphoneGuiListener, Lin
 
 
 	private void callPending(final LinphoneCall call) {
-		if (getResources().getBoolean(R.bool.use_incoming_call_activity)) {
-			Intent intent = new Intent()
-					.setClass(this, IncomingCallActivity.class)
-					.putExtra("stringUri", call.getRemoteAddress().asStringUriOnly());
-			startActivityForResult(intent, INCOMING_CALL_ACTIVITY);
-		} else if (getResources().getBoolean(R.bool.use_incoming_call_dialog)) {
-			showDialog(incomingCallDialogId);
-		}
+		Intent intent = new Intent()
+		.setClass(this, IncomingCallActivity.class)
+		.putExtra("stringUri", call.getRemoteAddress().asStringUriOnly());
+		startActivityForResult(intent, INCOMING_CALL_ACTIVITY);
 	}
 
-	@Override
-	protected void onPrepareDialog(int id, Dialog dialog) {
-		if (id == incomingCallDialogId) {
-			LinphoneAddress address = LinphoneManager.getLc().getRemoteAddress();
-			String from = LinphoneManager.extractIncomingRemoteName(getResources(), address);
-			String msg = String.format(getString(R.string.incoming_call_dialog_title), from);
-			((AlertDialog) dialog).setMessage(msg);
-		} else {
-			super.onPrepareDialog(id, dialog);
-		}
-	}
 
 	@Override
 	protected Dialog onCreateDialog(int id) {
-		if (id == incomingCallDialogId) {
-			View incomingCallView = getLayoutInflater().inflate(R.layout.incoming_call, null);
-
-			final Dialog dialog = new AlertDialog.Builder(this)
-			.setMessage("")
-			.setCancelable(false)
-			.setView(incomingCallView).create();
-
-
-			((CallButton) incomingCallView.findViewById(R.id.Call)).setExternalClickListener(new OnClickListener() {
-				public void onClick(View v) {
-					dialog.dismiss();
-					if (Version.isVideoCapable()) {
-						LinphoneManager.getInstance().resetCameraFromPreferences();
-
-						// Privacy setting to not share the user camera by default
-						boolean prefVideoEnable = LinphoneManager.getInstance().isVideoEnabled();
-						int key = R.string.pref_video_automatically_share_my_video_key;
-						boolean prefAutoShareMyCamera = mPref.getBoolean(getString(key), false);
-						boolean videoMuted = !(prefVideoEnable && prefAutoShareMyCamera);
-
-						LinphoneManager.getLc().getCurrentCall().enableCamera(!(videoMuted || useConferenceActivity));
-					}
-				}
-			});
-			((HangCallButton) incomingCallView.findViewById(R.id.Decline)).setExternalClickListener(new OnClickListener() {
-				public void onClick(View v) {dialog.dismiss();}
-			});
-
-			return dialog;
-		} else if (id == LinphoneManagerWaitHelper.DIALOG_ID) {
+		if (id == LinphoneManagerWaitHelper.DIALOG_ID) {
 			return waitHelper.createWaitDialog();
 		} else {
 			return super.onCreateDialog(id);

From 23ddab7710d3cffa2b160209ae9a35ff6a103b27 Mon Sep 17 00:00:00 2001
From: Guillaume Beraudo <guillaume.beraudo@belledonne-communications.com>
Date: Thu, 20 Oct 2011 14:29:35 +0200
Subject: [PATCH 62/62] Move some callbacks + auto start video on share.

---
 src/org/linphone/ConferenceActivity.java   | 22 +++++++++-
 src/org/linphone/DialerActivity.java       | 49 +++++++---------------
 src/org/linphone/IncomingCallActivity.java |  4 +-
 src/org/linphone/LinphoneActivity.java     | 36 ++++++++++++----
 src/org/linphone/LinphoneManager.java      | 22 ++++++++--
 src/org/linphone/LinphoneService.java      |  2 +-
 src/org/linphone/VideoCallActivity.java    |  4 +-
 submodules/linphone                        |  2 +-
 8 files changed, 88 insertions(+), 53 deletions(-)

diff --git a/src/org/linphone/ConferenceActivity.java b/src/org/linphone/ConferenceActivity.java
index 938703180..397ace968 100644
--- a/src/org/linphone/ConferenceActivity.java
+++ b/src/org/linphone/ConferenceActivity.java
@@ -179,6 +179,11 @@ public class ConferenceActivity extends ListActivity implements
 		if (multipleCallsLimit > 0) {
 			updateAddCallButton();
 		}
+
+		LinphoneCall currentCall = LinphoneManager.getLc().getCurrentCall();
+		if (currentCall != null) {
+			tryToStartVideoActivity(currentCall, currentCall.getState());
+		}
 	}
 
 	private void updateAddCallButton() {
@@ -193,9 +198,9 @@ public class ConferenceActivity extends ListActivity implements
 
 	protected void registerLinphoneListener(boolean register) {
 		if (register)
-			LinphoneManager.getInstance().addListener(this);
+			LinphoneManager.addListener(this);
 		else
-			LinphoneManager.getInstance().removeListener(this);
+			LinphoneManager.removeListener(this);
 	}
 
 
@@ -670,10 +675,23 @@ public class ConferenceActivity extends ListActivity implements
 		controlLayout.setVisibility(hide ? GONE : VISIBLE);
 	}
 
+	private void tryToStartVideoActivity(LinphoneCall call, State state) {
+		if (State.StreamsRunning == state && call.getCurrentParamsCopy().getVideoEnabled()) {
+			if (call.cameraEnabled() ) {
+				LinphoneActivity.instance().startVideoActivity();
+			} else {
+				Log.i("Not starting video call activity as the camera is disabled");
+			}
+		}
+	}
+
 	public void onCallStateChanged(final LinphoneCall call, final State state,
 			final String message) {
 		final String stateStr = call + " " + state.toString();
 		Log.d("ConferenceActivity received state ",stateStr);
+		
+		tryToStartVideoActivity(call, state);
+		
 		mHandler.post(new Runnable() {
 			public void run() {
 				CalleeListAdapter adapter = (CalleeListAdapter) getListAdapter();
diff --git a/src/org/linphone/DialerActivity.java b/src/org/linphone/DialerActivity.java
index 907265d56..70cb5ac8d 100644
--- a/src/org/linphone/DialerActivity.java
+++ b/src/org/linphone/DialerActivity.java
@@ -87,8 +87,6 @@ public class DialerActivity extends Activity implements LinphoneGuiListener, Lin
 	private static final String CURRENT_ADDRESS = "org.linphone.current-address"; 
 	private static final String CURRENT_DISPLAYNAME = "org.linphone.current-displayname";
 
-	private static final int INCOMING_CALL_ACTIVITY = 10;
-
 	/**
 	 * @return null if not ready yet
 	 */
@@ -159,13 +157,11 @@ public class DialerActivity extends Activity implements LinphoneGuiListener, Lin
 
 	@Override
 	public void onCreateWhenManagerReady() {
-		LinphoneCore lc = LinphoneManager.getLc();
-		if (lc.isIncall()) {
-			if(lc.isInComingInvitePending()) {
-				callPending(lc.getCurrentCall());
-			} else {
-				enterIncallMode(lc);
-			}
+		LinphoneCall pendingCall = LinphoneManager.getInstance().getPendingIncomingCall();
+		if (pendingCall != null) {
+			LinphoneActivity.instance().startIncomingCallActivity(pendingCall);
+		} else if (LinphoneManager.getLc().isIncall()) {
+			enterIncallMode();
 		}
 	}
 
@@ -226,8 +222,9 @@ public class DialerActivity extends Activity implements LinphoneGuiListener, Lin
 	
 
 	
-	private void enterIncallMode(LinphoneCore lc) {
-		LinphoneAddress address = LinphoneManager.getLc().getRemoteAddress();
+	private void enterIncallMode() {
+		LinphoneCore lc = LinphoneManager.getLc();
+		LinphoneAddress address = lc.getRemoteAddress();
 		mDisplayNameView.setText(LinphoneManager.extractADisplayName(getResources(), address));
 
 //		setVolumeControlStream(AudioManager.STREAM_VOICE_CALL);
@@ -280,8 +277,6 @@ public class DialerActivity extends Activity implements LinphoneGuiListener, Lin
 	
 	
 	private void exitCallMode() {
-		finishActivity(INCOMING_CALL_ACTIVITY);
-
 		if (useIncallActivity) {
 			LinphoneActivity.instance().closeIncallActivity();
 		} else if(useConferenceActivity) { 
@@ -306,14 +301,6 @@ public class DialerActivity extends Activity implements LinphoneGuiListener, Lin
 	}
 
 
-	private void callPending(final LinphoneCall call) {
-		Intent intent = new Intent()
-		.setClass(this, IncomingCallActivity.class)
-		.putExtra("stringUri", call.getRemoteAddress().asStringUriOnly());
-		startActivityForResult(intent, INCOMING_CALL_ACTIVITY);
-	}
-
-
 	@Override
 	protected Dialog onCreateDialog(int id) {
 		if (id == LinphoneManagerWaitHelper.DIALOG_ID) {
@@ -379,29 +366,21 @@ public class DialerActivity extends Activity implements LinphoneGuiListener, Lin
 			return;
 		}
 		
-		if (state==LinphoneCall.State.OutgoingInit){
-			call.enableCamera(LinphoneManager.getInstance().shareMyCamera());
-			enterIncallMode(lc);
-			LinphoneActivity.instance().startOrientationSensor();
-		}else if (state==LinphoneCall.State.IncomingReceived){
-			callPending(call);
-			call.enableCamera(LinphoneManager.getInstance().shareMyCamera());
-			LinphoneActivity.instance().startOrientationSensor();
-		}else if (state==LinphoneCall.State.Connected){
+		if (state==State.OutgoingInit){
+			enterIncallMode();
+		}else if (state==State.Connected){
 			if (call.getDirection() == CallDirection.Incoming) {
-				enterIncallMode(lc);
+				enterIncallMode();
 			}
-		}else if (state==LinphoneCall.State.Error){
+		}else if (state==State.Error){
 			showToast(R.string.call_error, message);
 			if (lc.getCallsNb() == 0){
 				if (mWakeLock.isHeld()) mWakeLock.release();
 				exitCallMode();
-				LinphoneActivity.instance().stopOrientationSensor();
 			}
-		}else if (state==LinphoneCall.State.CallEnd){
+		}else if (state==State.CallEnd){
 			if (lc.getCallsNb() == 0){
 				exitCallMode();
-				LinphoneActivity.instance().stopOrientationSensor();
 			}
 		}
 
diff --git a/src/org/linphone/IncomingCallActivity.java b/src/org/linphone/IncomingCallActivity.java
index ce1c2fe0a..766e3ffa7 100644
--- a/src/org/linphone/IncomingCallActivity.java
+++ b/src/org/linphone/IncomingCallActivity.java
@@ -96,7 +96,7 @@ public class IncomingCallActivity extends Activity implements LinphoneManagerRea
 
 	@Override
 	public void onResumeWhenManagerReady() {
-		LinphoneManager.getInstance().addListener(this);
+		LinphoneManager.addListener(this);
 		findIncomingCall(getIntent());
 		if (mCall == null) {
 			finish();
@@ -125,7 +125,7 @@ public class IncomingCallActivity extends Activity implements LinphoneManagerRea
 	@Override
 	protected void onPause() {
 		super.onPause();
-		LinphoneManager.getInstance().removeListener(this);
+		LinphoneManager.removeListener(this);
 	}
 	
 	@Override
diff --git a/src/org/linphone/LinphoneActivity.java b/src/org/linphone/LinphoneActivity.java
index faad7585a..be968e857 100644
--- a/src/org/linphone/LinphoneActivity.java
+++ b/src/org/linphone/LinphoneActivity.java
@@ -22,10 +22,13 @@ package org.linphone;
 import static android.content.Intent.ACTION_MAIN;
 
 import org.linphone.LinphoneManager.EcCalibrationListener;
+import org.linphone.LinphoneSimpleListener.LinphoneOnCallStateChangedListener;
 import org.linphone.core.LinphoneAddress;
+import org.linphone.core.LinphoneCall;
 import org.linphone.core.LinphoneCore;
 import org.linphone.core.LinphoneCoreException;
 import org.linphone.core.Log;
+import org.linphone.core.LinphoneCall.State;
 import org.linphone.core.LinphoneCore.EcCalibratorStatus;
 import org.linphone.core.LinphoneCore.RegistrationState;
 import org.linphone.mediastream.Version;
@@ -50,13 +53,12 @@ import android.text.Html;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
-import android.widget.FrameLayout;
 import android.widget.TabWidget;
 import android.widget.TextView;
 import android.widget.Toast;
 import android.widget.TabHost.TabSpec;
 	
-public class LinphoneActivity extends TabActivity implements SensorEventListener, ContactPicked {
+public class LinphoneActivity extends TabActivity implements SensorEventListener, ContactPicked, LinphoneOnCallStateChangedListener {
 	public static final String DIALER_TAB = "dialer";
     public static final String PREF_FIRST_LAUNCH = "pref_first_launch";
     private static final int video_activity = 100;
@@ -69,12 +71,10 @@ public class LinphoneActivity extends TabActivity implements SensorEventListener
 	private static LinphoneActivity instance;
 	
 	
-	private FrameLayout mMainFrame;
 	private SensorManager mSensorManager;
 	private Sensor mAccelerometer;
 	private int previousRotation = -1;
 	
-	private static final String SCREEN_IS_HIDDEN = "screen_is_hidden";
 	private Handler mHandler = new Handler();
 	
 	
@@ -110,7 +110,6 @@ public class LinphoneActivity extends TabActivity implements SensorEventListener
 		startService(new Intent(ACTION_MAIN).setClass(this, LinphoneService.class));
 
 		
-		mMainFrame = (FrameLayout) findViewById(R.id.main_frame);
 		mSensorManager = (SensorManager) getSystemService(Context.SENSOR_SERVICE);
 		SharedPreferences pref = PreferenceManager.getDefaultSharedPreferences(this);
 
@@ -131,6 +130,7 @@ public class LinphoneActivity extends TabActivity implements SensorEventListener
 			}
 		}
 
+		LinphoneManager.addListener(this);
 	}
 	
 	
@@ -254,11 +254,11 @@ public class LinphoneActivity extends TabActivity implements SensorEventListener
 	@Override
 	protected void onPause() {
 		super.onPause();
-		
 		if  (isFinishing())  {
 			//restore audio settings
 			boolean isUserRequest = false;
 			LinphoneManager.getInstance().routeAudioToReceiver(isUserRequest);
+			LinphoneManager.removeListener(this);
 			LinphoneManager.stopProximitySensorForActivity(this);
 			instance = null;
 		}
@@ -488,7 +488,14 @@ public class LinphoneActivity extends TabActivity implements SensorEventListener
 				}
 		});
 	}
-	
+
+	public void startIncomingCallActivity(LinphoneCall pendingCall) {
+		Intent intent = new Intent()
+			.setClass(this, IncomingCallActivity.class)
+			.putExtra("stringUri", pendingCall.getRemoteAddress().asStringUriOnly());
+		startActivityForResult(intent, INCOMING_CALL_ACTIVITY);
+	}
+
 	public void finishVideoActivity() {
 		mHandler.post(new Runnable() {
 			public void run() {
@@ -496,6 +503,21 @@ public class LinphoneActivity extends TabActivity implements SensorEventListener
 			}
 		});
 	}
+
+	@Override
+	public void onCallStateChanged(LinphoneCall call, State state,
+			String message) {
+		if (state==State.IncomingReceived) {
+			startIncomingCallActivity(call);
+		}
+		if (state==State.OutgoingInit || state==State.IncomingReceived) {
+			startOrientationSensor();
+		} else if (state==State.Error || state==State.CallEnd){
+			stopOrientationSensor();
+			finishActivity(INCOMING_CALL_ACTIVITY);
+		}
+		
+	}
 }
 
 
diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java
index 0518daa4f..65e475e36 100644
--- a/src/org/linphone/LinphoneManager.java
+++ b/src/org/linphone/LinphoneManager.java
@@ -49,6 +49,7 @@ import java.util.TimerTask;
 import org.linphone.LinphoneSimpleListener.LinphoneOnAudioChangedListener;
 import org.linphone.LinphoneSimpleListener.LinphoneServiceListener;
 import org.linphone.LinphoneSimpleListener.LinphoneOnAudioChangedListener.AudioState;
+import org.linphone.core.CallDirection;
 import org.linphone.core.LinphoneAddress;
 import org.linphone.core.LinphoneAuthInfo;
 import org.linphone.core.LinphoneCall;
@@ -133,13 +134,13 @@ public final class LinphoneManager implements LinphoneCoreListener {
 
 	private WakeLock mIncallWakeLock;
 
-	private List<LinphoneSimpleListener> simpleListeners = new ArrayList<LinphoneSimpleListener>();
-	public void addListener(LinphoneSimpleListener listener) {
+	private static List<LinphoneSimpleListener> simpleListeners = new ArrayList<LinphoneSimpleListener>();
+	public static void addListener(LinphoneSimpleListener listener) {
 		if (!simpleListeners.contains(listener)) {
 			simpleListeners.add(listener);
 		}
 	}
-	public void removeListener(LinphoneSimpleListener listener) {
+	public static void removeListener(LinphoneSimpleListener listener) {
 		simpleListeners.remove(listener);
 	}
 
@@ -1139,6 +1140,10 @@ public final class LinphoneManager implements LinphoneCoreListener {
 
 		public void onCallStateChanged(LinphoneCall call, State state,
 				String message) {
+			if (state==State.OutgoingInit || state==State.IncomingReceived) {
+				boolean sendCamera = shareMyCamera() && mLc.getConferenceSize() == 0;
+				call.enableCamera(sendCamera);
+			}
 			if (state == State.CallEnd && call == requestedVideoCall) {
 				requestedVideoCall = null; // drop reference
 			}
@@ -1190,5 +1195,16 @@ public final class LinphoneManager implements LinphoneCoreListener {
 	public static final boolean isInstanciated() {
 		return instance != null;
 	}
+	
+	public synchronized LinphoneCall getPendingIncomingCall() {
+		LinphoneCall currentCall = mLc.getCurrentCall();
+		if (currentCall == null) return null;
+
+		LinphoneCall.State state = currentCall.getState();
+		boolean incomingPending = currentCall.getDirection() == CallDirection.Incoming
+			&& (state == State.IncomingReceived || state == State.CallIncomingEarlyMedia);
+
+		return incomingPending ? currentCall : null;
+	}
 
 }
diff --git a/src/org/linphone/LinphoneService.java b/src/org/linphone/LinphoneService.java
index f34718c9d..b25566c7d 100644
--- a/src/org/linphone/LinphoneService.java
+++ b/src/org/linphone/LinphoneService.java
@@ -100,7 +100,7 @@ public final class LinphoneService extends Service implements LinphoneServiceLis
 	@Override
 	public void onCreate() {
 		super.onCreate();
-		
+
 		// In case restart after a crash. Main in LinphoneActivity
 		LinphonePreferenceManager.getInstance(this);
 
diff --git a/src/org/linphone/VideoCallActivity.java b/src/org/linphone/VideoCallActivity.java
index 96cd6882b..30753c247 100755
--- a/src/org/linphone/VideoCallActivity.java
+++ b/src/org/linphone/VideoCallActivity.java
@@ -169,7 +169,7 @@ public class VideoCallActivity extends Activity implements LinphoneOnCallStateCh
 		if (mVideoViewReady != null)
 			((GLSurfaceView)mVideoViewReady).onResume();
 		launched=true;
-		LinphoneManager.getInstance().addListener(this);
+		LinphoneManager.addListener(this);
 		refreshHandler.postDelayed(mCallQualityUpdater=new Runnable(){
 			LinphoneCall mCurrentCall=LinphoneManager.getLc().getCurrentCall();
 			public void run() {
@@ -282,7 +282,7 @@ public class VideoCallActivity extends Activity implements LinphoneOnCallStateCh
 	@Override
 	protected void onPause() {
 		Log.d("onPause VideoCallActivity (isFinishing:", isFinishing(), ", inCall:", LinphoneManager.getLc().isIncall(), ", changingConf:", getChangingConfigurations());
-		LinphoneManager.getInstance().removeListener(this);
+		LinphoneManager.removeListener(this);
 		if (isFinishing()) {
 			videoCall = null; // release reference
 		}
diff --git a/submodules/linphone b/submodules/linphone
index 324551708..973953df0 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 324551708e89dde781dc93a1eeae05532c8717f8
+Subproject commit 973953df07d1c435bd738024400e0ab4603a4fba