commit 1f4a623084219ae9f8d7c012c0d25c63c7aae7ca
author Tingting Wang <tingtingw@google.com> Wed Dec 16 17:39:54 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Dec 16 17:39:54 2015 +0000
tree 7417e5f2f8ea340bb1b3238d00da559693ef10ad
parent 82b293711b38fca4a30b5bf1b1637a1280a8d861
parent 6062cec2b36471fbc9a40c1b268a0ce88db03369

Merge "Fix bugs when dropping down editor type list in Editor UI.(2/2)" into ub-contactsdialer-b-dev

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 6fb07a6..7be748e 100644
--- a/src/com/android/contacts/editor/LabeledEditorView.java
+++ b/src/com/android/contacts/editor/LabeledEditorView.java
@@ -458,7 +458,7 @@
                 final String customText = editText.getText().toString().trim();
                 if (ContactsUtils.isGraphic(customText)) {
                     final List<EditType> allTypes =
-                            RawContactModifier.getValidTypes(mState, mKind, null);
+                            RawContactModifier.getValidTypes(mState, mKind, null, true, null, true);
                     mType = null;
                     for (EditType editType : allTypes) {
                         if (editType.customColumn != null) {
@@ -598,7 +598,7 @@
                 }
             }
 
-            addAll(RawContactModifier.getValidTypes(mState, mKind, mType));
+            addAll(RawContactModifier.getValidTypes(mState, mKind, mType, true, null, false));
         }
 
         public boolean hasCustomSelection() {