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

7 files changed, 65 insertions, 36 deletions

diff --git a/res/drawable/bubble.xml b/res/drawable/bubble.xml
new file mode 100644
index 0000000..4c9fe13
--- /dev/null
+++ b/res/drawable/bubble.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* bubble_with_chats.xml
+**
+** Copyright 2009, Google Inc.
+**
+** 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.
+*/
+-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true" android:drawable="@drawable/list_item_im_bubble_pressed" />
+    <item android:state_selected="true" android:drawable="@drawable/list_item_im_bubble_selected" />
+    <item android:state_enabled="false" android:drawable="@drawable/list_item_im_bubble_default" />
+    <item android:drawable="@drawable/list_item_im_bubble_default" />
+</selector>
diff --git a/res/drawable/default_background.9.png b/res/drawable/default_background.9.png
new file mode 100644
index 0000000..b4dfdf1
--- /dev/null
+++ b/res/drawable/default_background.9.png
diff --git a/res/drawable/list_item_im_bubble.9.png b/res/drawable/list_item_im_bubble.9.png
new file mode 100644
index 0000000..dd5e00a
--- /dev/null
+++ b/res/drawable/list_item_im_bubble.9.png
diff --git a/res/drawable/list_item_im_bubble_default.9.png b/res/drawable/list_item_im_bubble_default.9.png
new file mode 100644
index 0000000..d284e72
--- /dev/null
+++ 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
new file mode 100644
index 0000000..962259c
--- /dev/null
+++ 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
new file mode 100644
index 0000000..e3c5861
--- /dev/null
+++ 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 faa938e..eba7a24 100644
--- a/res/layout/account_view.xml
+++ b/res/layout/account_view.xml
@@ -23,57 +23,61 @@
     android:layout_width="fill_parent"
     android:layout_height="?android:attr/listPreferredItemHeight">
 
-    <ImageView
-        android:id="@+id/providerIcon"
-        android:scaleType="centerCrop"
-        android:layout_width="32dip"
-        android:layout_height="32dip"/>
+    <RelativeLayout
+        android:paddingLeft="0dip"
+        android:layout_width="39dip"
+        android:layout_height="48dip"
+        android:layout_gravity="center_vertical">
+        <ImageView
+            android:id="@+id/providerIcon"
+            android:layout_alignParentLeft="true"
+            android:layout_centerVertical="true"
+            android:scaleType="fitXY"
+            android:paddingLeft="5dip"
+            android:paddingRight="2dip"
+            android:layout_width="39dip"
+            android:layout_height="32dip"/> 
+    </RelativeLayout>
 
-    <LinearLayout android:orientation="vertical"
-        android:paddingLeft="4dip"
+    <LinearLayout
+        android:id="@+id/underBubble"
+        android:orientation="vertical"
+        android:layout_weight="1"
         android:layout_width="0dip"
-        android:layout_height="fill_parent"
-        android:gravity="center_vertical"
-        android:layout_weight="1">
-        <TextView android:id="@+id/line1"
+        android:layout_height="fill_parent">    
+
+        <TextView android:id="@+id/providerName"
             android:textAppearance="?android:attr/textAppearanceSmall"
-            android:textColor="?android:attr/textColorPrimary"
             android:maxLines="1"
             android:textSize="16sp"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content" />
 
         <LinearLayout android:orientation="horizontal"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content">
+            android:layout_width="fill_parent"
+            android:layout_height="0dip"
+            android:gravity="center_vertical"
+            android:layout_weight="1">
             <ImageView
                 android:id="@+id/statusIcon"
                 android:scaleType="fitXY"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
                 android:paddingRight="6dip"
-                />
-            <TextView android:id="@+id/line2"
+                android:layout_width="24dip"
+                android:layout_height="18dip"/>
+            <TextView android:id="@+id/loginName"
                 android:textSize="16sp"
                 android:maxLines="1"
-                android:layout_width="fill_parent"
+                android:layout_weight="1"
+                android:layout_width="0dip"
                 android:layout_height="wrap_content"/>
-            </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="fill_parent"
-        android:orientation="vertical"
-        android:gravity="center_vertical" >
-
-        <TextView android:id="@+id/conversations"
-            android:textSize="12sp"
-            android:maxLines="1"
-            android:textColor="?android:attr/textColorPrimary"
-            android:paddingRight="5dip"
-            android:layout_width="wrap_content"
-            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"/>
 </com.android.providers.im.ProviderListItem>