auto import from //branches/cupcake/...@127101

6 files changed, 22 insertions, 14 deletions

diff --git a/res/drawable/list_item_im_bubble.9.png b/res/drawable/list_item_im_bubble.9.png
deleted file mode 100644
index dd5e00a..0000000
--- a/res/drawable/list_item_im_bubble.9.png
+++ /dev/null
diff --git a/res/drawable/list_item_im_bubble_default.9.png b/res/drawable/list_item_im_bubble_default.9.png
index d284e72..f04412c 100644
--- a/res/drawable/list_item_im_bubble_default.9.png
+++ b/res/drawable/list_item_im_bubble_default.9.png
diff --git a/res/drawable/list_item_im_bubble_pressed.9.png b/res/drawable/list_item_im_bubble_pressed.9.png
index 962259c..669cae9 100644
--- a/res/drawable/list_item_im_bubble_pressed.9.png
+++ b/res/drawable/list_item_im_bubble_pressed.9.png
diff --git a/res/drawable/list_item_im_bubble_selected.9.png b/res/drawable/list_item_im_bubble_selected.9.png
index e3c5861..cf2244b 100644
--- a/res/drawable/list_item_im_bubble_selected.9.png
+++ b/res/drawable/list_item_im_bubble_selected.9.png
diff --git a/res/layout/account_view.xml b/res/layout/account_view.xml
index eba7a24..9a2ef70 100644
--- a/res/layout/account_view.xml
+++ b/res/layout/account_view.xml
@@ -46,13 +46,27 @@
         android:layout_width="0dip"
         android:layout_height="fill_parent">    
 
-        <TextView android:id="@+id/providerName"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:maxLines="1"
-            android:textSize="16sp"
+        <LinearLayout android:orientation="horizontal"
             android:layout_width="fill_parent"
-            android:layout_height="wrap_content" />
-
+            android:layout_height="0dip"
+            android:gravity="center_vertical"
+            android:layout_weight="1">
+            <TextView android:id="@+id/providerName"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:maxLines="1"
+                android:textSize="16sp"
+                android:ellipsize="marquee"
+                android:layout_weight="1"
+                android:layout_width="0dip"
+                android:layout_height="wrap_content" />
+            <TextView android:id="@+id/conversations"
+                android:textSize="12sp"
+                android:maxLines="1"
+                android:paddingRight="3dip"
+                android:gravity="right"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content" />
+        </LinearLayout>
         <LinearLayout android:orientation="horizontal"
             android:layout_width="fill_parent"
             android:layout_height="0dip"
@@ -65,18 +79,12 @@
                 android:layout_width="24dip"
                 android:layout_height="18dip"/>
             <TextView android:id="@+id/loginName"
+                android:ellipsize="marquee"
                 android:textSize="16sp"
                 android:maxLines="1"
                 android:layout_weight="1"
                 android:layout_width="0dip"
                 android:layout_height="wrap_content"/>
-            <TextView android:id="@+id/conversations"
-                android:textSize="12sp"
-                android:maxLines="1"
-                android:paddingRight="3dip"
-                android:gravity="right"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content" />
         </LinearLayout>
     </LinearLayout>
     <View android:layout_width="5dip" android:layout_height="fill_parent"/>
diff --git a/src/com/android/providers/im/LandingPage.java b/src/com/android/providers/im/LandingPage.java
index 364a899..66bf61e 100644
--- a/src/com/android/providers/im/LandingPage.java
+++ b/src/com/android/providers/im/LandingPage.java
@@ -512,7 +512,7 @@ public class LandingPage extends ListActivity implements View.OnCreateContextMen
         boolean isLoggedIn = isSignedIn(providerCursor);
 
         if (!isLoggedIn) {
-            menu.add(0, ID_SIGN_IN, 0, R.string.sign_in).setIcon(android.R.drawable.ic_menu_login);
+            menu.add(0, ID_SIGN_IN, 0, R.string.sign_in).setIcon(com.android.internal.R.drawable.ic_menu_login);
         } else {
             BrandingResources brandingRes = getBrandingResource(providerId);
             menu.add(0, ID_VIEW_CONTACT_LIST, 0,