Merge "Editor name fields" into lmp-mr1-dev

5 files changed, 27 insertions, 21 deletions

diff --git a/res/layout/edit_field_list.xml b/res/layout/edit_field_list.xml
index 0073112d3..066810a3c 100644
--- a/res/layout/edit_field_list.xml
+++ b/res/layout/edit_field_list.xml
@@ -20,6 +20,7 @@
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/editors"
-    android:layout_width="match_parent"
+    android:layout_width="0dip"
     android:layout_height="wrap_content"
+    android:layout_weight="1"
     android:orientation="vertical" />
diff --git a/res/layout/phonetic_name_editor_view.xml b/res/layout/phonetic_name_editor_view.xml
index d67dcf560..efaf64458 100644
--- a/res/layout/phonetic_name_editor_view.xml
+++ b/res/layout/phonetic_name_editor_view.xml
@@ -20,33 +20,29 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:minHeight="@dimen/editor_min_line_item_height"
-    android:orientation="vertical">
+    android:layout_marginStart="@dimen/editor_kind_icon_total_width">
 
+    <!-- This isn't used in PhoneticNameEditorView. It is only included so that
+        StructuredNameEditorView's base classes don't need extra null checks. -->
     <include
         android:id="@+id/spinner"
         layout="@layout/edit_spinner"
         android:visibility="gone" />
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:gravity="center_vertical">
-
-        <include
-            android:id="@+id/editors"
-            layout="@layout/edit_field_list" />
-
-        <include
-            android:id="@+id/expansion_view_container"
-            layout="@layout/name_edit_expansion_view"
-            android:visibility="gone" />
+    <include
+        android:id="@+id/editors"
+        layout="@layout/edit_field_list" />
 
-        <include
-            android:id="@+id/delete_button_container"
-            layout="@layout/edit_delete_button"
-            android:visibility="gone" />
+    <include
+        android:id="@+id/expansion_view_container"
+        layout="@layout/name_edit_expansion_view"
+        android:visibility="visible" />
 
-    </LinearLayout>
+    <!-- This isn't used in PhoneticNameEditorView. It is only included so that
+        StructuredNameEditorView's base classes don't need extra null checks. -->
+    <include
+        android:id="@+id/delete_button_container"
+        layout="@layout/edit_delete_button"
+        android:visibility="gone" />
 
 </com.android.contacts.editor.PhoneticNameEditorView>
diff --git a/res/layout/raw_contact_editor_view.xml b/res/layout/raw_contact_editor_view.xml
index 03996b515..ace6c8f0d 100644
--- a/res/layout/raw_contact_editor_view.xml
+++ b/res/layout/raw_contact_editor_view.xml
@@ -38,6 +38,10 @@
         layout="@layout/phonetic_name_editor_view" />
 
     <include
+        android:id="@+id/edit_nick_name"
+        layout="@layout/item_kind_section" />
+
+    <include
         android:id="@+id/edit_photo"
         android:layout_marginRight="8dip"
         android:layout_marginEnd="8dip"
diff --git a/res/layout/structured_name_editor_view.xml b/res/layout/structured_name_editor_view.xml
index fc57159e1..b6d6ecaa7 100644
--- a/res/layout/structured_name_editor_view.xml
+++ b/res/layout/structured_name_editor_view.xml
@@ -42,6 +42,8 @@
         layout="@layout/name_edit_expansion_view"
         android:visibility="gone" />
 
+    <!-- This isn't used in StructuredNameEditorView. It is only included so that
+        StructuredNameEditorView's base classes don't need extra null checks. -->
     <include
         android:id="@+id/delete_button_container"
         layout="@layout/edit_delete_button"
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 69b56dcf4..53855ba05 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -57,6 +57,9 @@
     <!-- Width and height of the mime-type icons inside the editor -->
     <dimen name="editor_kind_icon_size">24dp</dimen>
 
+    <!-- Total width of data-kind icon, including its start and end padding -->
+    <dimen name="editor_kind_icon_total_width">72dp</dimen>
+
     <!-- Padding below every editor view, such as LabeledEditorView -->
     <dimen name="editor_padding_between_editor_views">24dp</dimen>