Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b7e654fa authored by Brian Attwell's avatar Brian Attwell Committed by Android (Google) Code Review
Browse files

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

parents 3b101dcc 2ebade89

res/layout/edit_field_list.xml

+2 −1
Original line number Diff line number Diff line
@@ -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" />

res/layout/phonetic_name_editor_view.xml

+16 −20
Original line number Diff line number Diff line
@@ -20,19 +20,15 @@ 
    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" />
@@ -40,13 +36,13 @@ 
    <include

        android:id="@+id/expansion_view_container"

        layout="@layout/name_edit_expansion_view"

            android:visibility="gone" />

        android:visibility="visible" />



    <!-- 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" />



    </LinearLayout>



</com.android.contacts.editor.PhoneticNameEditorView>

res/layout/raw_contact_editor_view.xml

+4 −0
Original line number Diff line number Diff line
@@ -37,6 +37,10 @@ 
        android:id="@+id/edit_phonetic_name"

        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"

res/layout/structured_name_editor_view.xml

+2 −0
Original line number Diff line number Diff line
@@ -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"

res/values/dimens.xml

+3 −0
Original line number Diff line number Diff line
@@ -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>