Merge.
authorVincent Veronis <veroni_v@epitech.net>
Fri, 30 Oct 2009 19:25:20 +0100
changeset 487 6122f9ed186f
parent 486 e12e3c23e31b (diff)
parent 481 3be6014b6cf4 (current diff)
child 488 77e8f3384a3b
Merge.
res/values-en/arrays.xml
res/values-en/strings.xml
--- a/src/com/beem/project/beem/service/XmppConnectionAdapter.java	Fri Oct 30 17:07:15 2009 +0100
+++ b/src/com/beem/project/beem/service/XmppConnectionAdapter.java	Fri Oct 30 19:25:20 2009 +0100
@@ -154,6 +154,8 @@
 		mConListener.connectionFailed(e.getMessage());
 	    else
 		mConListener.connectionFailed("Error On Connection");
+	} catch (IllegalStateException e) {
+	    mConListener.connectionFailed(e.getMessage());
 	}
 	return false;
     }
--- a/src/com/beem/project/beem/ui/ContactList.java	Fri Oct 30 17:07:15 2009 +0100
+++ b/src/com/beem/project/beem/ui/ContactList.java	Fri Oct 30 19:25:20 2009 +0100
@@ -28,6 +28,8 @@
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.animation.Animation;
+import android.view.animation.TranslateAnimation;
 import android.widget.AdapterView;
 import android.widget.BaseAdapter;
 import android.widget.Gallery;
@@ -559,6 +561,7 @@
 		    v.setText(curContact.getMsgState());
 		    v.setTextColor(Color.WHITE);
 		    v.setTextSize(12);
+		    v.setHorizontallyScrolling(isFinishing());
 		}
 	    }
 	}