# HG changeset patch
# User Marseille
# Date 1245863181 -7200
# Node ID 3ac42eddf713e732ec4d70e2d4619eda758774a2
# Parent  597ee98a647730667368baccea3994b0a95840bb# Parent  1ba29ab8e122728c31ce8bf91177d93ec146a9ba
Merge.

diff -r 1ba29ab8e122 -r 3ac42eddf713 res/layout/contactdialogaliasdialog.xml
--- a/res/layout/contactdialogaliasdialog.xml	Wed Jun 24 20:38:24 2009 +0200
+++ b/res/layout/contactdialogaliasdialog.xml	Wed Jun 24 19:06:21 2009 +0200
@@ -4,7 +4,8 @@
 	android:layout_height="fill_parent">
 
 	<EditText android:id="@+id/CDAliasDialogName"
-		android:layout_width="fill_parent" android:layout_height="wrap_content" />
+		android:layout_width="fill_parent" android:layout_height="wrap_content"
+		android:singleLine="true" android:maxLines="1" />
 
 	<Button android:id="@+id/CDAliasDialogOk" android:layout_width="fill_parent"
 		android:layout_height="wrap_content" android:text="@string/OkButton" />
diff -r 1ba29ab8e122 -r 3ac42eddf713 res/layout/contactlistcontact.xml
--- a/res/layout/contactlistcontact.xml	Wed Jun 24 20:38:24 2009 +0200
+++ b/res/layout/contactlistcontact.xml	Wed Jun 24 19:06:21 2009 +0200
@@ -14,7 +14,8 @@
 		android:layout_height="wrap_content">
 		<TextView android:id="@+id/contactlistpseudo"
 			android:layout_width="fill_parent" android:layout_height="wrap_content"
-			android:paddingLeft="20sp" />
+			android:paddingLeft="20sp" android:singleLine="true"
+			android:maxLines="1" />
 		<TextView android:id="@+id/contactlistmsgperso"
 			android:layout_width="fill_parent" android:layout_height="wrap_content"
 			android:paddingLeft="20sp" android:singleLine="true"
diff -r 1ba29ab8e122 -r 3ac42eddf713 src/com/beem/project/beem/ui/ContactList.java
--- a/src/com/beem/project/beem/ui/ContactList.java	Wed Jun 24 20:38:24 2009 +0200
+++ b/src/com/beem/project/beem/ui/ContactList.java	Wed Jun 24 19:06:21 2009 +0200
@@ -208,10 +208,6 @@
 	    mHandler.post(new RunnableChange());
 	}
 
-	/**
-	 * TODO: sur la suppression de contact, on passe tt le temps dans entries updated ... probleme comment
-	 * reconnaitre si on supprime ou ajoute un contact ....
-	 */
 	@Override
 	public void onEntriesUpdated(List<String> addresses) throws RemoteException {
 	    Log.d("CONTACTLIST", "DEBUG - ONENTRIESUPDATED()");
@@ -371,12 +367,11 @@
 		    v.setText(curContact.getMsgState());
 		}
 
-		// TODO: Rajouter l'avatar du contact getAvatar() dans la classe
-		imgV = (ImageView) view.findViewById(R.id.contactlistavatar);
-		if (imgV != null) {
-		    imageDrawable = getResources().getDrawable(R.drawable.avatar);
-		    imgV.setImageDrawable(imageDrawable);
-		}
+		/*
+		 * TODO: Rajouter l'avatar du contact getAvatar() dans la classe imgV = (ImageView)
+		 * view.findViewById(R.id.contactlistavatar); if (imgV != null) { imageDrawable =
+		 * getResources().getDrawable(R.drawable.avatar); imgV.setImageDrawable(imageDrawable); }
+		 */
 	    }
 	}