Merge "b/5341562 Adjust recent contact font size/max length"
diff --git a/res/layout/contact_tile_frequent_phone.xml b/res/layout/contact_tile_frequent_phone.xml
index 26c221c..dffdfc7 100644
--- a/res/layout/contact_tile_frequent_phone.xml
+++ b/res/layout/contact_tile_frequent_phone.xml
@@ -55,31 +55,38 @@
android:fadingEdgeLength="3dip"
android:ellipsize="marquee" />
- <TextView
- android:id="@+id/contact_tile_phone_number"
- android:layout_width="wrap_content"
+ <LinearLayout
+ android:orientation="horizontal"
android:layout_height="wrap_content"
- android:textSize="14sp"
- android:textColor="@color/dialtacts_secondary_text_color"
- android:layout_marginLeft="8dip"
- android:singleLine="true"
- android:maxLength="18"
+ android:layout_width="match_parent"
+ android:layout_below="@id/contact_tile_name"
android:layout_toRightOf="@id/image_container"
- android:layout_below="@id/contact_tile_name" />
+ android:gravity="center_vertical">
- <TextView
- android:id="@+id/contact_tile_phone_type"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textSize="14sp"
- android:ellipsize="end"
- android:singleLine="true"
- android:textAllCaps="true"
- android:textColor="@color/dialtacts_secondary_text_color"
- android:layout_marginLeft="12dip"
- android:maxLength="8"
- android:layout_alignParentRight="true"
- android:layout_alignTop="@id/contact_tile_phone_number" />
+ <TextView
+ android:id="@+id/contact_tile_phone_number"
+ android:layout_width="0dip"
+ android:layout_height="wrap_content"
+ android:layout_weight="5"
+ android:textSize="14sp"
+ android:textColor="@color/dialtacts_secondary_text_color"
+ android:layout_marginLeft="8dip"
+ android:singleLine="true"/>
+
+ <TextView
+ android:id="@+id/contact_tile_phone_type"
+ android:layout_width="0dip"
+ android:layout_height="wrap_content"
+ android:layout_weight="3"
+ android:textSize="12sp"
+ android:ellipsize="end"
+ android:singleLine="true"
+ android:textAllCaps="true"
+ android:textColor="@color/dialtacts_secondary_text_color"
+ android:layout_marginLeft="8dip"
+ android:gravity="right" />
+
+ </LinearLayout>
<View
android:id="@+id/contact_tile_horizontal_divider"