Merge branch 'froyo' of http://github.com/sileht/android_packages_apps_Contacts into froyo

4 files changed, 60 insertions, 29 deletions

diff --git a/res/layout-finger/contacts_list_item_photo.xml b/res/layout-finger/contacts_list_item_photo.xml
index c4636e952..2079930cc 100644
--- a/res/layout-finger/contacts_list_item_photo.xml
+++ b/res/layout-finger/contacts_list_item_photo.xml
@@ -83,7 +83,7 @@
         <android.widget.QuickContactBadge android:id="@+id/photo"
             android:layout_alignParentLeft="true"
             android:layout_centerVertical="true"
-            style="@*android:style/Widget.QuickContactBadge.WindowMedium" />
+            style="@*android:style/Widget.QuickContactBadge.WindowMedium"
         />
         
         <!-- Wysie: Removed the following
@@ -93,7 +93,6 @@
             android:layout_alignParentLeft="true"
             android:layout_centerVertical="true"            
             style="@*android:style/Widget.QuickContactBadge.WindowMedium"
-            android:background="@null" />
         />
 
         <TextView android:id="@+id/label"
diff --git a/res/layout-finger/recent_calls_list_child_item.xml b/res/layout-finger/recent_calls_list_child_item.xml
index 17c31fdde..48bc91f96 100644
--- a/res/layout-finger/recent_calls_list_child_item.xml
+++ b/res/layout-finger/recent_calls_list_child_item.xml
@@ -17,7 +17,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="?android:attr/listPreferredItemHeight"
-    android:paddingLeft="7dip"
+    android:paddingLeft="12dip"
     android:background="@drawable/list_item_background_secondary"
 >
 
diff --git a/res/layout-finger/recent_calls_list_group_item.xml b/res/layout-finger/recent_calls_list_group_item.xml
index 2d3e7af3b..a9d437598 100644
--- a/res/layout-finger/recent_calls_list_group_item.xml
+++ b/res/layout-finger/recent_calls_list_group_item.xml
@@ -17,7 +17,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="?android:attr/listPreferredItemHeight"
-    android:paddingLeft="7dip"
+    android:paddingLeft="4dip"
 >
 
     <com.android.contacts.ui.widget.DontPressWithParentImageView android:id="@+id/call_icon"
@@ -38,17 +38,29 @@
         android:layout_marginTop="5dip"
         android:layout_marginBottom="5dip"
         android:layout_toLeftOf="@id/call_icon"
-        android:layout_marginLeft="11dip"
+        android:layout_marginLeft="2dip"
         android:background="@drawable/divider_vertical_dark"
     />
 
+    <ImageView android:id="@+id/call_type_icon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentTop="true"
+        android:layout_toLeftOf="@id/call_icon"
+        android:layout_alignWithParentIfMissing="true"
+        android:layout_marginRight="9dip"
+        android:layout_marginLeft="4dip"
+    />
+
+
     <TextView android:id="@+id/date"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_toLeftOf="@id/divider"
         android:layout_alignParentBottom="true"
         android:layout_marginBottom="8dip"
-        android:layout_marginLeft="10dip"
+        android:layout_alignWithParentIfMissing="true"
+        android:layout_marginRight="5dip"
 
         android:textAppearance="?android:attr/textAppearanceSmall"
         android:singleLine="true"
@@ -57,10 +69,12 @@
     <TextView android:id="@+id/label"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
+        android:layout_toRightOf="@id/photo"
         android:layout_alignParentBottom="true"
-        android:layout_marginLeft="36dip"
-        android:layout_alignBaseline="@id/date"
+        android:layout_marginBottom="8dip"
+        android:layout_marginTop="-10dip"
+        android:layout_marginLeft="10dip"
+        android:layout_alignWithParentIfMissing="true"
 
         android:singleLine="true"
         android:ellipsize="marquee"
@@ -85,27 +99,53 @@
     <TextView android:id="@+id/groupSize"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_toLeftOf="@id/call_type_icon"
         android:layout_alignParentTop="true"
-        android:layout_toLeftOf="@id/divider"
-        android:layout_above="@id/date"
+        android:layout_marginTop="8dip"
         android:layout_alignWithParentIfMissing="true"
-        android:layout_marginBottom="-10dip"
+        android:layout_marginRight="5dip"
+
 
         android:textAppearance="?android:attr/textAppearanceLarge"
         android:singleLine="true"
+    />
+
+    <android.widget.QuickContactBadge android:id="@+id/photo"
+        android:layout_alignParentLeft="true"
+        android:layout_centerVertical="true"
+        style="@*android:style/Widget.QuickContactBadge.WindowLarge" />
+    
+    <ImageView android:id="@+id/noQuickContactPhoto"
+        android:layout_alignParentLeft="true"
+        android:layout_centerVertical="true"            
+        style="@*android:style/Widget.QuickContactBadge.WindowMedium"
+    />
+
+    <ImageView
+        android:id="@+id/groupIndicator"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentTop="true"
+        android:layout_toRightOf="@id/photo"
+        android:layout_above="@id/date"
+        android:layout_alignWithParentIfMissing="true"
+        android:layout_marginBottom="-10dip"
+        android:layout_marginLeft="2dip"
+
+        android:layout_centerVertical="true"
+        android:src="@*android:drawable/expander_ic_minimized"
         android:gravity="center_vertical"
     />
 
     <TextView android:id="@+id/line1"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
         android:layout_alignParentTop="true"
-        android:layout_toLeftOf="@+id/groupSize"
+        android:layout_toRightOf="@id/groupIndicator"
         android:layout_above="@id/date"
         android:layout_alignWithParentIfMissing="true"
-        android:layout_marginLeft="36dip"
         android:layout_marginBottom="-10dip"
+        android:layout_marginLeft="2dip"
 
         android:textAppearance="?android:attr/textAppearanceLarge"
         android:singleLine="true"
@@ -113,13 +153,5 @@
         android:gravity="center_vertical"
     />
 
-    <ImageView
-        android:id="@+id/groupIndicator"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
-        android:layout_centerVertical="true"
-        android:src="@*android:drawable/expander_ic_minimized"
-        android:gravity="center_vertical"
-    />
+
 </RelativeLayout>
diff --git a/res/layout-finger/recent_calls_list_item_layout.xml b/res/layout-finger/recent_calls_list_item_layout.xml
index 2cc9a1a37..8fe6eeb47 100644
--- a/res/layout-finger/recent_calls_list_item_layout.xml
+++ b/res/layout-finger/recent_calls_list_item_layout.xml
@@ -36,6 +36,7 @@
         android:layout_marginLeft="4dip"
     />
 
+
     <TextView android:id="@+id/date"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -56,7 +57,7 @@
         android:layout_alignParentBottom="true"
         android:layout_marginBottom="8dip"
         android:layout_marginTop="-10dip"
-        android:layout_marginLeft="8dip"
+        android:layout_marginLeft="10dip"
         android:layout_alignWithParentIfMissing="true"
 
         android:singleLine="true"
@@ -88,19 +89,18 @@
         android:layout_alignParentLeft="true"
         android:layout_centerVertical="true"            
         style="@*android:style/Widget.QuickContactBadge.WindowMedium"
-        android:background="@null" />
+    />
 
 
     <TextView android:id="@+id/line1"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
         android:layout_alignParentTop="true"
-        android:layout_toLeftOf="@id/divider"
+        android:layout_toRightOf="@id/photo"
         android:layout_above="@id/date"
         android:layout_alignWithParentIfMissing="true"
-        android:layout_marginLeft="54dip"
         android:layout_marginBottom="-10dip"
+        android:layout_marginLeft="4dip"
 
         android:textAppearance="?android:attr/textAppearanceLarge"
         android:singleLine="true"