Merge "Phonetic name field underlines stretch across" into oc-dev
am: 1d2db44297
Change-Id: I2a2a5056c9d6a5721ccecca7cd3ab8b20c9188e4
diff --git a/res/layout/text_fields_editor_view.xml b/res/layout/text_fields_editor_view.xml
index dc3a312..326977d 100644
--- a/res/layout/text_fields_editor_view.xml
+++ b/res/layout/text_fields_editor_view.xml
@@ -43,6 +43,6 @@
<include
android:id="@+id/delete_button_container"
layout="@layout/edit_delete_button"
- android:visibility="gone" />
+ android:visibility="invisible" />
</com.android.contacts.editor.TextFieldsEditorView>
diff --git a/src/com/android/contacts/editor/LabeledEditorView.java b/src/com/android/contacts/editor/LabeledEditorView.java
index 68832ff..5712f39 100644
--- a/src/com/android/contacts/editor/LabeledEditorView.java
+++ b/src/com/android/contacts/editor/LabeledEditorView.java
@@ -70,7 +70,7 @@
private Spinner mLabel;
private EditTypeAdapter mEditTypeAdapter;
- private View mDeleteContainer;
+ protected View mDeleteContainer;
private ImageView mDelete;
private DataKind mKind;
@@ -230,7 +230,7 @@
mDeleteContainer.setVisibility(View.VISIBLE);
mDelete.setEnabled(!mReadOnly && isEnabled());
} else {
- mDeleteContainer.setVisibility(View.GONE);
+ mDeleteContainer.setVisibility(View.INVISIBLE);
}
}
diff --git a/src/com/android/contacts/editor/StructuredNameEditorView.java b/src/com/android/contacts/editor/StructuredNameEditorView.java
index 0ede939..1387bd1 100644
--- a/src/com/android/contacts/editor/StructuredNameEditorView.java
+++ b/src/com/android/contacts/editor/StructuredNameEditorView.java
@@ -22,6 +22,7 @@
import android.os.Parcel;
import android.os.Parcelable;
import android.util.AttributeSet;
+import android.view.View;
import com.android.contacts.R;
import com.android.contacts.model.RawContactDelta;
@@ -73,6 +74,9 @@
mChanged = false;
}
updateEmptiness();
+ // Right alien with rest of the editors. As this view has an extra expand/collapse view on
+ // the right, we need to free the space from deleteContainer
+ mDeleteContainer.setVisibility(View.GONE);
}
@Override