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

Commit c37a0018 authored by avipul's avatar avipul Committed by Vipul Mittal
Browse files

DO NOT MERGE Phonetic name field underlines stretch across 

Test:
1. open editor
2. expand more fields
3. see phonetic name fields
4. Phonetic name fields should be aliend with rest of the name fields

Bug: 35433983
Change-Id: I19df75e6340192692f745d17ec0a99e2b1463414
(cherry picked from commit e1cf3ff6b2b9dfe499049f9605585cd6f67c8a5a)
parent 45243820

res/layout/text_fields_editor_view.xml

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

src/com/android/contacts/editor/LabeledEditorView.java

+2 −2
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ public abstract class LabeledEditorView extends LinearLayout implements Editor, 


    private Spinner mLabel;

    private EditTypeAdapter mEditTypeAdapter;

    private View mDeleteContainer;

    protected View mDeleteContainer;

    private ImageView mDelete;



    private DataKind mKind;
@@ -230,7 +230,7 @@ public abstract class LabeledEditorView extends LinearLayout implements Editor, 
            mDeleteContainer.setVisibility(View.VISIBLE);

            mDelete.setEnabled(!mReadOnly && isEnabled());

        } else {

            mDeleteContainer.setVisibility(View.GONE);

            mDeleteContainer.setVisibility(View.INVISIBLE);

        }

    }

src/com/android/contacts/editor/StructuredNameEditorView.java

+4 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.content.res.Resources; 
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 @@ public class StructuredNameEditorView extends TextFieldsEditorView { 
            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