Fix layout for read-only contacts
Bug: 5149895
Change-Id: I3c033e80bc3b34093f975641694ded291a1a96a5
diff --git a/res/layout/external_raw_contact_editor_view.xml b/res/layout/external_raw_contact_editor_view.xml
index a1e0754..f1ba198 100644
--- a/res/layout/external_raw_contact_editor_view.xml
+++ b/res/layout/external_raw_contact_editor_view.xml
@@ -40,8 +40,7 @@
android:singleLine="true"
android:ellipsize="end"
android:textAppearance="?android:attr/textAppearanceMedium"
- android:textColor="?android:attr/textColorSecondary"
- android:textStyle="bold"/>
+ android:textColor="?android:attr/textColorSecondary" />
<LinearLayout
android:id="@+id/stub_photo"
diff --git a/res/layout/item_read_only_field.xml b/res/layout/item_read_only_field.xml
index 5f8367f..2765cfa 100644
--- a/res/layout/item_read_only_field.xml
+++ b/res/layout/item_read_only_field.xml
@@ -24,28 +24,39 @@
android:id="@+id/kind_title_layout"
layout="@layout/edit_kind_title" />
+ <!-- Shown only when id/kind_title_layout is hidden, dividing a previous item and this item. -->
+ <View
+ android:id="@+id/divider"
+ android:layout_width="match_parent"
+ android:layout_height="1px"
+ android:layout_marginLeft="8dip"
+ android:layout_marginRight="8dip"
+ android:background="?android:attr/listDivider" />
+
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="@dimen/editor_min_line_item_height"
+ android:layout_marginLeft="16dip"
+ android:layout_marginRight="16dip"
android:orientation="horizontal">
<TextView
android:id="@+id/data"
- android:layout_width="wrap_content"
+ android:layout_width="0px"
android:layout_height="wrap_content"
+ android:layout_weight="1"
android:layout_gravity="center_vertical"
- android:layout_marginLeft="16dip"
android:textAppearance="?android:attr/textAppearanceMedium"
- android:textColor="?android:attr/textColorPrimary"
+ android:textColor="?android:attr/textColorSecondary"
android:singleLine="true"/>
<TextView
android:id="@+id/type"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
- android:layout_marginLeft="8dip"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorSecondary"
+ android:textAllCaps="true"
android:singleLine="true"/>
</LinearLayout>
diff --git a/src/com/android/contacts/editor/ExternalRawContactEditorView.java b/src/com/android/contacts/editor/ExternalRawContactEditorView.java
index 0a1ae74..9b4f988 100644
--- a/src/com/android/contacts/editor/ExternalRawContactEditorView.java
+++ b/src/com/android/contacts/editor/ExternalRawContactEditorView.java
@@ -252,12 +252,15 @@
private void bindData(
CharSequence titleText, CharSequence data, CharSequence type, boolean isFirstEntry) {
final View field = mInflater.inflate(R.layout.item_read_only_field, mGeneral, false);
+ final View divider = field.findViewById(R.id.divider);
if (isFirstEntry) {
final TextView titleView = (TextView) field.findViewById(R.id.kind_title);
titleView.setText(titleText);
+ divider.setVisibility(View.GONE);
} else {
View titleContainer = field.findViewById(R.id.kind_title_layout);
titleContainer.setVisibility(View.GONE);
+ divider.setVisibility(View.VISIBLE);
}
final TextView dataView = (TextView) field.findViewById(R.id.data);
dataView.setText(data);