commit 305dede05942b0ed125bb9ba27c049ded30df98b
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Jul 15 03:14:24 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jul 15 03:14:25 2016 +0000
tree a2039fa94e3c91cac640f753c1bdf2ecab3574fd
parent 2b37503348095eb595b1e3dbde9e92cb1773279d
parent f5493a638ad3faa5183ab7d33872585bcd6e178d

Merge "Bring action bar up to spec (E2)"

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

diff --git a/src/com/android/contacts/editor/LabeledEditorView.java b/src/com/android/contacts/editor/LabeledEditorView.java
index 63d75d8..61c1061 100644
--- a/src/com/android/contacts/editor/LabeledEditorView.java
+++ b/src/com/android/contacts/editor/LabeledEditorView.java
@@ -300,8 +300,8 @@
                             mEntry.getAsString(mType.customColumn),
                             getContext().getString(mKind.titleRes)));
         } else {
-            mLabel.setSelection(mEditTypeAdapter.getPosition(mType));
             if (mType != null) {
+                mLabel.setSelection(mEditTypeAdapter.getPosition(mType));
                 mDeleteContainer.setContentDescription(
                         getContext().getString(R.string.editor_delete_view_description,
                                 getContext().getString(mType.labelRes),
@@ -408,10 +408,8 @@
         mLabel.setEnabled(!readOnly && isEnabled());
         mLabel.setContentDescription(getContext().getResources().getString(mKind.titleRes));
 
-        if (hasTypes) {
-            mType = RawContactModifier.getCurrentType(entry, kind);
-            rebuildLabel();
-        }
+        mType = RawContactModifier.getCurrentType(entry, kind);
+        rebuildLabel();
     }
 
     public ValuesDelta getValues() {