From 1358258d72438645133c0697daaf333daf8d7472 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <Sylvain.Berfini@Belledonne-Communications.com>
Date: Thu, 20 Sep 2012 18:10:56 +0200
Subject: [PATCH] Improved interface for fast new chat field

---
 .../chat_fast_address_background.png          | Bin 0 -> 4242 bytes
 res/layout/chatlist.xml                       |  34 ++++++++++++++----
 src/org/linphone/ChatListFragment.java        |  12 ++++++-
 3 files changed, 39 insertions(+), 7 deletions(-)
 create mode 100644 res/drawable-hdpi/chat_fast_address_background.png

diff --git a/res/drawable-hdpi/chat_fast_address_background.png b/res/drawable-hdpi/chat_fast_address_background.png
new file mode 100644
index 0000000000000000000000000000000000000000..5825587e7436ba4c2c12aab81d83f5ccd38b373e
GIT binary patch
literal 4242
zcmbVPdpOhm`~S?!<S=82lG(E<C1!J&bD6`C96}Kl!(=&Zw$VrqlS5Bsq=OC;DpU_1
zhmag{_K+SSA#;upNe(%FKc1(a-|u%_&-MM|w`<p~`~BYQe%<%|y6^Y)d0(=%HWL%x
zB@6(7n1#8C9RLWRK$|Qi2mp|8F~8Bl#ZI=V6WgBd#Xd)2QUQ`D-JOcI@S~ie+EFQ<
z!2wNFeE@)Z(HxxEPF6>BJ?MTo$|eTK@neAA0HA+}!=QNhP}yjA>KU590cNJG5`(6B
z8ekkXt?*V1W2!gJJcLQL53zRe2=VdI@x&ZDh}P%mf&_k4HU-V`^Yv%xatttk@#=#1
z=C&#Z{TGDoV}SWPDJLsiv@xAYMQh^JRXp$n0-8v~5i~T3M1nF}4Np*0#e;963PD3x
zlc=kvh5qrvfYF$qUb=QB<R7uXl>x?^&1UGTs-8P{4tGu+M`xZ<CFtnrY;vfnselL-
zR<J*t!cp;OVSh51P+1;K8iP%v`=d7*Dem+@wgCpr^zRb<7*<yQ5c{)!2n9-}%Aqh+
z2{^o}pWkL(f1z1yJL><W@vmr>LokD?YDZ<!1DPIRKfJI%ok8vXd!S7qn2oLtlLj`0
z;%h?p2=t@+vn@;vFyJ>hPnxGLo}dk?sHK6|Qo|Fq2?P?^*jUHNSc^<F*23$M2tPUg
z&6jAbO*AE$639lHL;}H-V5DJcWUNM1*ES*(H3;e&KYcCyS!{~G2lZ!M8W{J7FaE#!
z>KZet6gHjdK&SiuoB&&II-Ab&rZdpS_L^ubiU-YqbG_M~zpFK&GHF3nPcoD4hyF`n
zUE06I$7}xIy0u9}6OxW8K~tSTRx{F6!~F2|{QqdC3MQkvIUN6MSblDS6S!&qGy34-
zpTk4-2Tu$WJQ|M|)yDupwA#Xi<iP2fx}gFWAc>MI;d04W&{#YNR|PRIQIf90B$Svk
zw(J&;PPY0OOA#SeNxe{|CH36ORr$PNCW8^xZ~Sx1;q3X+J?ZMrc_(u3u;BGFza31l
zn{dA}FzU{aMGTa~E?i5$W+$AybIQwJ@l)PABlUc_8I@lWCOktWV0MDoN{gLRtJ_NX
z(?vy(PhZqd7)lFhEp3YKT&Kb_Ef*yXuUvjN1Bt$}UtPUDQsS=e`r3xbGnb|HHRxl6
zh+pZ(1EP?uY;T;E+{XHv$I|R@!$#DYzk2?c*;&Guxw$CWJ=oG!5Um$gxNk#sM^I1@
zV?w6sb&!+N;LwO0RbXqaca3i$h1i3~>KeL<U2BW!4v*2}xvsl+2aT`(?so3L)5O!w
zfNW+Jcm9x`Awb}gTMVNwWygFA_ww=*M8rttXGDK)v_RmOXZkDMLYM39$qdJs=-aeM
zS0fM0c>8YY*bUi}kjPiq*<?kq9a@^7l#VKw=-R+aPy4zjN+3mt2L~wwBO_bHF<i+;
z?@t7#rG%{j<e2IMrQ@W-wY;qk&Jo&q*E}>RS3ZP^2t~YwWGO%%ZQHxIFs#LUNM@^d
zlUJdumM~dwJtKlkKG0sCnY)uDhD5+Fn!WN)kC^wG)(@)_LW%W+4k%~MzH-mWTy{Bb
z$1c39$3-@@OVefIU0>EgM%K4nf^2c?7j;Goa`)}l5_u>8OJT9_qwUVGmZ8hA)zteU
zs1O?IA&f*5--X~lh<*E%l=QixE%GFDJeVI<K9U^j`LX==jR!|wI4XWxIm6Z~zgYf+
zlq!;RE!3=R#o_pw=E*m$dvxZ{_c<UP46aMya0NFxD324{3UXg&8I>4umx(21))MhF
zxDno0fExz2B-E_jU0|1f_oklM+gzHw07VFT1`QhaM~)Qk6P~J5K+WxlNLwjY-v8Y4
za{O`Jr)=qch0hT1UdBEdwexL9D{dmW6#M1ASCDx8(Q}Ghq9QtYScC&|-xcHRkCHWx
zB+W|<+lx`lslQ2SbHXFf3e<KwcI|)C8tIZV2bCo7x#`y-U-FzrVU>LwK`4J7Nj(tG
z_l=6oR!*M_U2LB{7W!rRAYIOeDpRhHgx4?zc!c{$EK_y6=e{E&QVJYtGQSEi?(TIi
zDpIkNk`lJ&V&GiulG3FuL)dZX_z<!rkik6nMXdJ3y^|9o1DLo%+bk<%muFW?+mJcG
z47?d&R*G9!N9)D#SgbcXNB1NzqpKAZQgUuuB3EwQPDj#HMlv9H>{v%XZ~onbwy&)*
z#v6wEv!<v>s}J*!qVJt-v0$je+`NR9x?@nqi#GlV(bh4ow!9m4Cn}TWc}f;ZN(Km_
zh!aDI;6^}PO1AmNs%7S6zkz<HUqfq&eO>6`3BkZf^MzN5TdQ7XT;{{~s|YJym(9lp
zHQzrV&9w7X{<@Uh?{?Hf*o`BI5jgtx&+waXY;FlZzwsPHF&{7Zh=4_u3LLGrJz;iI
zX^@eXH?2Jg+ixZX6to#6uoK<)_$dqnKp)J)=dvgi2ur#Yn&VA_L{vtC&jG<e)uHC7
z;}*bDe2JoRZr9AJCl-h(c{Tsyey8{Ir*;;Py9%)gKq0YXGMzu~wbB9q#t02Q#R_`<
z4nAD4tHarE1pMi0!5)4|ur?jIoRl^rZ>sWLxS{nPot`s&m1=f76>j)WqA8<mGBd~j
ztaNTv@u}`P9B}?zd%Fn&<`!C}Cqk&$u2L)LzD4wSTsDkwT2!m@BCI@kAVS`dw+zuA
zmoo@hgmMUk#EV%S4u|&$JBg~^Bs!S)f5?_gfxBEX!KIAdx_)cwzB%V>>Z6vz+Tk~~
z5{V5L4T3PODQLO%T)pp+0x7Oy^Vz522amv9`A>_2Lw_-<=(mKY29|}s+9(BX;vDZJ
zH8|jDM_yBzUrQ#Y2aeICd9h6*vnvfR)}UGtjDq3V)|!*~Sv3N=ycAaW)Q#qud><aS
zS-geXJiu{xYg#nzRT0`I==P={KF?1mYJcr*t6T+c?~X7V6tq0^U|`_)l^}$NxP29$
zGd`FgZbgOSQf5|?*I)AEA`$oR?waD6dTLZZM~{@k+(zf(Z!)rW)TS%$9`wUGJSn=2
zLFwr{sh%wsOMtxByfBW8<wvBgt79!)i+2+``eoaO(*&wfkAc}g^&aHZc^p+Nco|^Y
zD6(9bR>|Q*-ph(#*sx>mN0xLGQC<PSd#MC31*74?(&@ZEH}c)rADO0frz0dE6huiZ
zl;!Ye(rywa?z}I?<`V)CqE&D&yn}elnEcr+#%nF^?XoOrp1J}>QK@k1K5B<ZI>eAp
z^45>r8d2j0^#o$?kWW5_14mFmyzg5y3RsWbHUx>FiU8mz2LLw=^#O!9VD`B0b|)_O
z1XSC^RtW^J2TNvmPTHJYyB8Bxza6-kL94f-I$ADot%g)xiRQ<McXyuBlH6b7bGNts
ztiAnQmX49Yds(py?H+5BAIR&$dA<QAMb39a*NCji`p&kjp3DRWP>Y=!Z_=9UHhSb-
zc3_5f@0g47=Y^It71xt4k<wae3GeS9^3LDJoJYH=?ar<nomgIU=e;PF5D#9S|D#yt
zkgM{jVtqrpm%b3pZLA}0X!b1b)O*~`^yLdi8+%>fe+r&uF3?`ieEaNk%Pjsps=-R&
zd40z3M}jL$l3e;jjz8^Ej2<icuxKB#Fuhpkrv?lxwJZ3&{Wk5aU;4Y)*!Q7YvDqMW
zzT^2}k^b*Swr!3Tb2paU!|V8yE|lFuf5;$7b#ih0;?#C}#5QbCF}=qM$>=)OTWIyx
zz~*z*i909TYh-b2VdxRFB;OC0%T#UNK4eT+KU&dhblu)I3pdVbhMsEQ_YzxN;gEmi
z=v~&wCsGZ{z3&(s>D2f&*itkUsH!ozDDjBAzhl9=OIlAw)q5(WtUS!E>CmFQ;NXB?
z&Aty}HKemPp4)hPcFH<ROMmG3-B{D?K7Rg!Ev*><(DD#T*LYXg?EbTy-q%6K<i;l-
zLeJm%qU|I7TFXXR^;oAl`R1*olHlc}h0IYfHDlXhu`ctyV!6^U6}#R{Nue&Q?Fw^s
z(edqlH00!))oa}@pg@BIz*h;B#a!V`-gtKJ<mCg0_}@k)%sPeQ4rW%6rX0F)VIj=X
zxZj{yzlts)p$w3HB)kx-qMtsO?-6HjbIAYH%6HymSqi`T>lZOOROSKePZ^yzu$ofR
z7VQtepmhPDF+3EkY5d_Gx4=<vtNMoTUd`uE-T#<Wy<B(oV}XqUF&CGc{CNN4t2}St
zho&%s0H_plXM3%gGuuQlw-<S<ILs$H>eam>+W?~moLB~C7iw0hNfKoOUckP~&6@wp
zEBs<B4tZ<!KsSTv3ZK^K&2^f~QO`8?s2n7L_ba@tgrvCmT2Z$J6q&EJ!;^C_???^4
zoolQzIbdGa5cLJrcB3tAqg63Fwjve#=~A7pQwLVplcjtj9bG?!q1|o+Rr0d`MsW+#
zS$A$6KdEV~Z&#Zo_3YuF$=i497eIlC?#sNTakEwRKJhk7)waO8IQiuHUL_M402Iig
zX@iMDfhP8Jx50pM0C01axb{wDxP6~~{`Dg-y};XF+wby%hd`ki36YXlw_|Bo0I1Rk
zNTlS3*FXVa0AkWes|F2y{6&xt4gQ4ygAf2P<bcNJegs$mupzeQ)w9Gr%Q12F5do=y
z;IB5EZ)*>l#X-bwbN?%XTAp-KE`GJDq}?}gNbjLsNf-Et?Dm|CvDEVJz1k<Iv(hs@
zzvepn$Aw!i-<YeCEgD^*c!pt7SegzW9#R@mtfJeu?#gVJp0I0X^=~k+qFlz*17(N+
zD30F2Yq}&Gip;Mw#PCned?)+V?7NmLOz^PvzP2vzlAli4W4IuU1b~Fp#>O7VlV8|o
zS)~)dzNzf~Hu~a#I4yhlSzGW00%H2stzy1w$iwBKp4rjEtMc#YckNjQ*+{c~Bk8L=
z-`vKnV5wsgS08?!eIG}Ty~9N#9CN$$ir4)^m3;;}$Ge5ca3_CFJy+pScu=p<$)Gf7
zbz2u+G;ObxWC$wd8YT*C0NQmnk@!|ZoOi%Qt0&xl#&=<PU4*$<|K5;n#1Yzws!7^H
z;vC;z>(T%}<jnclL~Y1#xim;(gUMGenTv?`i`N#VPV_BX1<qt~x-_n+KiTTZQMk{t
z<HXsvs<b1*5KmS}{Djo<y*3M>b%A$s>?LzNr2Fze!)^A)fs@3PlFxvJ7wPo{^-eDI
zp0+9MIel!Q$}u1IZq#ftAF1EHtr{;}z5A4$g$VEb!|eHt`ZT{`u*HCdskKRtksJ3v
D?TSC$

literal 0
HcmV?d00001

diff --git a/res/layout/chatlist.xml b/res/layout/chatlist.xml
index bc0f8bfb0..e104e5ec3 100644
--- a/res/layout/chatlist.xml
+++ b/res/layout/chatlist.xml
@@ -55,13 +55,35 @@
         
     </LinearLayout>
     
-    <EditText
-        android:id="@+id/newFastChat"
+    <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:hint="@string/new_fast_chat"
-        android:textColor="@android:color/black"
-        android:inputType="textEmailAddress"/>
+        android:layout_height="wrap_content">
+	    
+	    <ImageView 
+	        android:contentDescription="@string/content_description_cancel"
+	        android:id="@+id/clearFastChatField"
+	        android:layout_width="wrap_content"
+	        android:layout_height="wrap_content"
+	        android:adjustViewBounds="true"
+	        android:src="@drawable/list_delete"
+	        android:layout_centerVertical="true"
+	        android:layout_alignParentRight="true"
+	        android:paddingLeft="5dp"
+	        android:paddingRight="5dp"/>
+        
+	    <EditText
+	        android:id="@+id/newFastChat"
+	        android:layout_width="match_parent"
+	        android:layout_height="wrap_content"
+	        android:hint="@string/new_fast_chat"
+	        android:textColor="@android:color/black"
+	        android:background="@drawable/chat_fast_address_background"
+	        android:gravity="center"
+	        android:layout_toLeftOf="@id/clearFastChatField"
+	        android:paddingRight="5dp"
+	        android:inputType="textEmailAddress"/>
+	    
+    </RelativeLayout>
     
     <ListView 
         android:id="@+id/chatList"
diff --git a/src/org/linphone/ChatListFragment.java b/src/org/linphone/ChatListFragment.java
index e7c70702c..07dd664b3 100644
--- a/src/org/linphone/ChatListFragment.java
+++ b/src/org/linphone/ChatListFragment.java
@@ -48,6 +48,7 @@ public class ChatListFragment extends Fragment implements OnClickListener, OnIte
 	private List<String> mConversations, mDrafts;
 	private ListView chatList;
 	private TextView edit, ok, newDiscussion;
+	private ImageView clearFastChat;
 	private EditText fastNewChat;
 	private boolean isEditMode = false;
 	
@@ -63,12 +64,18 @@ public class ChatListFragment extends Fragment implements OnClickListener, OnIte
 		
 		edit = (TextView) view.findViewById(R.id.edit);
 		edit.setOnClickListener(this);
+		
 		newDiscussion = (TextView) view.findViewById(R.id.newDiscussion);
 		newDiscussion.setOnClickListener(this);
+		
 		ok = (TextView) view.findViewById(R.id.ok);
 		ok.setOnClickListener(this);
 		
+		clearFastChat = (ImageView) view.findViewById(R.id.clearFastChatField);
+		clearFastChat.setOnClickListener(this);
+		
 		fastNewChat = (EditText) view.findViewById(R.id.newFastChat);
+		
 		return view;
 	}
 
@@ -112,7 +119,10 @@ public class ChatListFragment extends Fragment implements OnClickListener, OnIte
 	public void onClick(View v) {
 		int id = v.getId();
 		
-		if (id == R.id.ok) {
+		if (id == R.id.clearFastChatField) {
+			fastNewChat.setText("");
+		}
+		else if (id == R.id.ok) {
 			edit.setVisibility(View.VISIBLE);
 			ok.setVisibility(View.GONE);
 			isEditMode = false;