commit 475ef41568184bd3b6f3faf9acda997736528648
author Mindy Pereira <mindyp@google.com> Tue Jun 28 14:51:59 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jun 28 14:51:59 2011 -0700
tree 4a25c27e93d5712a38bc2c0096b592438dc237fd
parent fd887659a4c59e49816ce656897d0f7f087d6e79
parent 2bc578406c81a6be7fae3b1216b8b175fd7446e1

Merge "Move contact picture to the right of the chip where the delete icon shows."

res/layout/chips_alternate_item.xml

diff --git a/res/layout/chips_alternate_item.xml b/res/layout/chips_alternate_item.xml
index 0d69659..0d4275a 100644
--- a/res/layout/chips_alternate_item.xml
+++ b/res/layout/chips_alternate_item.xml
@@ -20,25 +20,14 @@
     android:layout_height="wrap_content"
     android:minHeight="30dip"
     android:orientation="horizontal"
-    android:gravity="left|center_vertical"
+    android:gravity="center_vertical"
     android:background="@drawable/list_item_background">
-    <FrameLayout
-        android:layout_width="50dip"
-        android:layout_height="wrap_content">
-        <ImageView
-            android:id="@android:id/icon"
-            android:layout_width="42dip"
-            android:layout_height="42dip"
-            android:layout_margin="4dip"
-            android:src="@drawable/ic_contact_picture"
-            android:cropToPadding="true"
-            android:scaleType="centerCrop" />
-    </FrameLayout>
     <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:gravity="left|center_vertical">
+        android:gravity="left|center_vertical"
+        android:layout_weight="1">
         <TextView android:id="@android:id/text1"
                   android:textColor="?android:attr/textColorPrimary"
                   android:textAppearance="?android:attr/textAppearanceMedium"
@@ -58,4 +47,16 @@
                   android:singleLine="true"
                   android:ellipsize="end" />
     </LinearLayout>
+    <FrameLayout
+        android:layout_width="50dip"
+        android:layout_height="wrap_content">
+        <ImageView
+            android:id="@android:id/icon"
+            android:layout_width="42dip"
+            android:layout_height="42dip"
+            android:layout_margin="4dip"
+            android:src="@drawable/ic_contact_picture"
+            android:cropToPadding="true"
+            android:scaleType="centerCrop" />
+    </FrameLayout>
 </LinearLayout>

res/layout/chips_recipient_dropdown_item.xml

diff --git a/res/layout/chips_recipient_dropdown_item.xml b/res/layout/chips_recipient_dropdown_item.xml
index b5c4e9d..1b11174 100644
--- a/res/layout/chips_recipient_dropdown_item.xml
+++ b/res/layout/chips_recipient_dropdown_item.xml
@@ -20,24 +20,13 @@
     android:layout_height="wrap_content"
     android:minHeight="30dip"
     android:orientation="horizontal"
-    android:gravity="left|center_vertical">
-    <FrameLayout
-        android:layout_width="50dip"
-        android:layout_height="wrap_content">
-        <ImageView
-            android:id="@android:id/icon"
-            android:layout_width="42dip"
-            android:layout_height="42dip"
-            android:layout_margin="4dip"
-            android:src="@drawable/ic_contact_picture"
-            android:cropToPadding="true"
-            android:scaleType="centerCrop" />
-    </FrameLayout>
+    android:gravity="center_vertical">
     <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:gravity="left|center_vertical">
+        android:gravity="left|center_vertical"
+        android:layout_weight="1">
         <TextView android:id="@android:id/text1"
                   android:textColor="?android:attr/textColorPrimary"
                   android:textAppearance="?android:attr/textAppearanceMedium"
@@ -57,4 +46,16 @@
                   android:singleLine="true"
                   android:ellipsize="end" />
     </LinearLayout>
+    <FrameLayout
+        android:layout_width="50dip"
+        android:layout_height="wrap_content">
+        <ImageView
+            android:id="@android:id/icon"
+            android:layout_width="42dip"
+            android:layout_height="42dip"
+            android:layout_margin="4dip"
+            android:src="@drawable/ic_contact_picture"
+            android:cropToPadding="true"
+            android:scaleType="centerCrop" />
+    </FrameLayout>
 </LinearLayout>