Fix a couple layout bugs in call list and call log.
-Fixed http://b/issue?id=2139651
-Fixed http://b/issue?id=2119813
-Also use the *opaque version of the dividers to match the default list
style.
Change-Id: Iaed2f3625630c6f09b0dd5742cf21102a37b11ac
diff --git a/res/layout-finger/contacts_list_item.xml b/res/layout-finger/contacts_list_item.xml
index f2c3204..ccc53e7 100644
--- a/res/layout-finger/contacts_list_item.xml
+++ b/res/layout-finger/contacts_list_item.xml
@@ -30,7 +30,7 @@
<View android:id="@+id/list_divider"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:background="@android:drawable/divider_horizontal_dark"
+ android:background="@*android:drawable/divider_horizontal_dark_opaque"
/>
<RelativeLayout
@@ -38,17 +38,49 @@
android:layout_height="?android:attr/listPreferredItemHeight"
android:paddingLeft="14dip"
>
-
- <ImageView android:id="@+id/presence"
- android:layout_width="32dip"
- android:layout_height="32dip"
- android:layout_alignParentRight="true"
- android:layout_marginLeft="5dip"
- android:layout_centerVertical="true"
-
- android:gravity="center"
- android:scaleType="centerInside"
- />
+
+ <LinearLayout android:id="@+id/right_side"
+ android:layout_width="wrap_content"
+ android:layout_height="fill_parent"
+ android:orientation="horizontal"
+ android:layout_marginLeft="11dip"
+ android:layout_alignParentRight="true">
+
+ <ImageView android:id="@+id/presence"
+ android:layout_width="32dip"
+ android:layout_height="32dip"
+ android:layout_marginLeft="5dip"
+ android:layout_marginRight="5dip"
+
+ android:layout_gravity="center_vertical"
+ android:scaleType="centerInside"
+ />
+
+ <LinearLayout android:id="@+id/call_view"
+ android:layout_width="wrap_content"
+ android:layout_height="fill_parent"
+ android:orientation="horizontal">
+
+ <View android:id="@+id/divider"
+ android:layout_width="1px"
+ android:layout_height="fill_parent"
+ android:background="@*android:drawable/divider_vertical_dark_opaque"
+ />
+
+ <ImageView android:id="@+id/call_button"
+ android:layout_width="wrap_content"
+ android:layout_height="fill_parent"
+ android:paddingLeft="14dip"
+ android:paddingRight="14dip"
+ android:layout_centerVertical="true"
+ android:gravity="center"
+ android:src="@android:drawable/sym_action_call"
+ android:background="@android:drawable/list_selector_background"
+ />
+
+ </LinearLayout>
+
+ </LinearLayout>
<TextView android:id="@+id/label"
android:layout_width="wrap_content"
@@ -70,7 +102,7 @@
android:layout_marginLeft="5dip"
android:layout_toRightOf="@id/label"
android:layout_alignBaseline="@id/label"
- android:layout_toLeftOf="@id/presence"
+ android:layout_toLeftOf="@id/right_side"
android:layout_alignWithParentIfMissing="true"
android:singleLine="true"
@@ -85,7 +117,7 @@
android:layout_alignWithParentIfMissing="true"
android:layout_alignParentTop="true"
android:layout_alignParentLeft="true"
- android:layout_toLeftOf="@id/presence"
+ android:layout_toLeftOf="@id/right_side"
android:layout_marginBottom="1dip"
android:singleLine="true"
@@ -94,31 +126,5 @@
android:textAppearance="?android:attr/textAppearanceLarge"
/>
- <LinearLayout android:id="@+id/call_view"
- android:layout_width="wrap_content"
- android:layout_height="fill_parent"
- android:orientation="horizontal"
- android:layout_marginLeft="11dip"
- android:layout_alignParentRight="true">
-
- <View android:id="@+id/divider"
- android:layout_width="1dip"
- android:layout_height="fill_parent"
- android:background="@drawable/divider_vertical_dark"
- />
-
- <ImageView android:id="@+id/call_button"
- android:layout_width="wrap_content"
- android:layout_height="fill_parent"
- android:paddingLeft="14dip"
- android:paddingRight="14dip"
- android:layout_centerVertical="true"
- android:gravity="center"
- android:src="@android:drawable/sym_action_call"
- android:background="@android:drawable/list_selector_background"
- />
-
- </LinearLayout>
-
</RelativeLayout>
</LinearLayout>
diff --git a/res/layout-finger/contacts_list_item_photo.xml b/res/layout-finger/contacts_list_item_photo.xml
index 9f762ab..7fecada 100644
--- a/res/layout-finger/contacts_list_item_photo.xml
+++ b/res/layout-finger/contacts_list_item_photo.xml
@@ -30,26 +30,56 @@
<View android:id="@+id/list_divider"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:background="@android:drawable/divider_horizontal_dark"
+ android:background="@*android:drawable/divider_horizontal_dark_opaque"
/>
<RelativeLayout
android:layout_width="fill_parent"
android:layout_height="?android:attr/listPreferredItemHeight"
android:paddingLeft="5dip"
- android:paddingRight="5dip"
>
- <ImageView android:id="@+id/presence"
- android:layout_width="32dip"
- android:layout_height="32dip"
- android:layout_alignParentRight="true"
- android:layout_marginLeft="5dip"
- android:layout_centerVertical="true"
-
- android:gravity="center"
- android:scaleType="centerInside"
- />
+ <LinearLayout android:id="@+id/right_side"
+ android:layout_width="wrap_content"
+ android:layout_height="fill_parent"
+ android:orientation="horizontal"
+ android:layout_marginLeft="11dip"
+ android:layout_alignParentRight="true">
+
+ <ImageView android:id="@+id/presence"
+ android:layout_width="32dip"
+ android:layout_height="32dip"
+ android:layout_marginLeft="5dip"
+ android:layout_marginRight="5dip"
+
+ android:layout_gravity="center_vertical"
+ android:scaleType="centerInside"
+ />
+
+ <LinearLayout android:id="@+id/call_view"
+ android:layout_width="wrap_content"
+ android:layout_height="fill_parent"
+ android:orientation="horizontal">
+
+ <View android:id="@+id/divider"
+ android:layout_width="1px"
+ android:layout_height="fill_parent"
+ android:background="@*android:drawable/divider_vertical_dark_opaque"
+ />
+
+ <ImageView android:id="@+id/call_button"
+ android:layout_width="wrap_content"
+ android:layout_height="fill_parent"
+ android:paddingLeft="14dip"
+ android:paddingRight="14dip"
+ android:layout_centerVertical="true"
+ android:gravity="center"
+ android:src="@android:drawable/sym_action_call"
+ android:background="@android:drawable/list_selector_background"
+ />
+
+ </LinearLayout>
+ </LinearLayout>
<android.widget.FasttrackBadgeWidget android:id="@+id/photo"
android:layout_alignParentLeft="true"
@@ -85,7 +115,7 @@
android:layout_height="wrap_content"
android:layout_marginLeft="5dip"
android:layout_toRightOf="@id/label"
- android:layout_toLeftOf="@id/presence"
+ android:layout_toLeftOf="@id/right_side"
android:layout_alignBaseline="@id/label"
android:layout_alignWithParentIfMissing="true"
@@ -98,7 +128,7 @@
android:layout_width="0dip"
android:layout_height="0dip"
android:layout_toRightOf="@id/photo"
- android:layout_toLeftOf="@id/presence"
+ android:layout_toLeftOf="@id/right_side"
android:layout_alignParentTop="true"
android:layout_above="@id/label"
android:layout_alignWithParentIfMissing="true"
@@ -109,30 +139,5 @@
android:textAppearance="?android:attr/textAppearanceLarge"
/>
- <LinearLayout android:id="@+id/call_view"
- android:layout_width="wrap_content"
- android:layout_height="fill_parent"
- android:orientation="horizontal"
- android:layout_marginLeft="11dip"
- android:layout_alignParentRight="true">
-
- <View android:id="@+id/divider"
- android:layout_width="1dip"
- android:layout_height="fill_parent"
- android:background="@drawable/divider_vertical_dark"
- />
-
- <ImageView android:id="@+id/call_button"
- android:layout_width="wrap_content"
- android:layout_height="fill_parent"
- android:paddingLeft="14dip"
- android:paddingRight="14dip"
- android:layout_centerVertical="true"
- android:gravity="center"
- android:src="@android:drawable/sym_action_call"
- android:background="@android:drawable/list_selector_background"
- />
-
- </LinearLayout>
</RelativeLayout>
</LinearLayout>
diff --git a/res/layout-finger/recent_calls_list_item.xml b/res/layout-finger/recent_calls_list_item.xml
index 275dea2..0f53d87 100644
--- a/res/layout-finger/recent_calls_list_item.xml
+++ b/res/layout-finger/recent_calls_list_item.xml
@@ -33,12 +33,12 @@
/>
<View android:id="@+id/divider"
- android:layout_width="1dip"
+ android:layout_width="1px"
android:layout_height="fill_parent"
android:layout_toLeftOf="@id/call_icon"
android:layout_marginLeft="11dip"
- android:background="@drawable/divider_vertical_dark"
+ android:background="@*android:drawable/divider_vertical_dark_opaque"
/>
<ImageView android:id="@+id/call_type_icon"