Merge "Adjusting colors and fonts in contact status bubble" into honeycomb
diff --git a/res/layout-large/contact_detail_header_view.xml b/res/layout-large/contact_detail_header_view.xml
index 6a310ba..19132dd 100644
--- a/res/layout-large/contact_detail_header_view.xml
+++ b/res/layout-large/contact_detail_header_view.xml
@@ -86,13 +86,13 @@
android:layout_height="wrap_content"
android:singleLine="true"
android:ellipsize="end"
- android:textSize="@dimen/contact_name_text_size"/>
+ android:textSize="@dimen/contact_name_text_size" />
<TextView
android:id="@+id/phonetic_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:textAppearance="?android:attr/textAppearanceSmall"
+ android:textAppearance="?android:attr/textAppearanceMedium"
android:singleLine="true"
android:ellipsize="end"
android:layout_marginTop="-2dip"
@@ -104,8 +104,8 @@
android:layout_height="wrap_content"
android:layout_marginTop="-2dip"
android:visibility="gone"
- android:textColor="#999999"
- android:textAppearance="?android:attr/textAppearanceLarge" />
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:textColor="?android:attr/textColorTertiary" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
@@ -121,19 +121,19 @@
android:layout_marginLeft="16dip"
android:layout_marginRight="24dip"
android:layout_marginTop="10dip"
- android:paddingLeft="32dip"
- android:paddingTop="40dip"
+ android:paddingLeft="12dip"
+ android:paddingTop="36dip"
android:paddingRight="16dip"
- android:paddingBottom="16dip"
+ android:paddingBottom="12dip"
android:visibility="gone">
<TextView
android:id="@+id/status"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:textColor="#66666666"
- android:maxLines="2"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:textColor="?android:attr/textColorSecondary"
+ android:maxLines="3"
android:ellipsize="end"
android:visibility="gone" />
@@ -141,8 +141,9 @@
android:id="@+id/status_date"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:textColor="#66666666"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:textColor="?android:attr/textColorTertiary"
+ android:gravity="right"
android:visibility="gone" />
</LinearLayout>
</LinearLayout>
diff --git a/res/layout-xlarge-land/contact_detail_header_view.xml b/res/layout-xlarge-land/contact_detail_header_view.xml
index 2b5f00c..fb57202 100644
--- a/res/layout-xlarge-land/contact_detail_header_view.xml
+++ b/res/layout-xlarge-land/contact_detail_header_view.xml
@@ -26,6 +26,7 @@
android:id="@+id/attribution"
android:layout_width="match_parent"
android:layout_height="56dip"
+ android:paddingRight="16dip"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="?android:attr/textColorTertiary"
android:gravity="right|center_vertical"
@@ -91,7 +92,7 @@
android:id="@+id/phonetic_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:textAppearance="?android:attr/textAppearanceSmall"
+ android:textAppearance="?android:attr/textAppearanceMedium"
android:singleLine="true"
android:ellipsize="end"
android:layout_marginTop="-2dip"
@@ -105,19 +106,8 @@
android:ellipsize="end"
android:layout_marginTop="-2dip"
android:visibility="gone"
- android:textColor="#999999"
- android:textAppearance="?android:attr/textAppearanceLarge" />
-
- <TextView
- android:id="@+id/directory_name"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:textAppearance="?android:attr/textAppearanceSmall"
- android:textColor="?android:attr/textColorSecondary"
- android:singleLine="true"
- android:ellipsize="end"
- android:layout_marginTop="-2dip"
- android:visibility="gone" />
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:textColor="?android:attr/textColorTertiary" />
</LinearLayout>
</LinearLayout>
@@ -136,19 +126,19 @@
android:background="@drawable/statusbox_landscape_holo_light"
android:layout_marginLeft="10dip"
android:layout_marginTop="30dip"
- android:paddingLeft="64dip"
- android:paddingTop="16dip"
+ android:paddingLeft="52dip"
+ android:paddingTop="12dip"
android:paddingRight="16dip"
- android:paddingBottom="16dip"
+ android:paddingBottom="12dip"
android:visibility="gone">
<TextView
android:id="@+id/status"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:textColor="#66666666"
- android:maxLines="2"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:textColor="?android:attr/textColorSecondary"
+ android:maxLines="3"
android:ellipsize="end"
android:visibility="gone" />
@@ -157,8 +147,9 @@
android:layout_width="match_parent"
android:layout_height="0dip"
android:layout_weight="1"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:textColor="#66666666"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:textColor="?android:attr/textColorTertiary"
+ android:gravity="right"
android:visibility="gone" />
</LinearLayout>
</LinearLayout>