commit 6062cec2b36471fbc9a40c1b268a0ce88db03369
author Tingting Wang <tingtingw@google.com> Thu Dec 10 14:54:59 2015 -0800
committer Tingting Wang <tingtingw@google.com> Tue Dec 15 16:08:45 2015 -0800
tree f4f72a2b0d45745c969944f7741c46202b92d16b
parent 740bc93ca276cc12a0e6a1cc75d3a725410be83e

Fix bugs when dropping down editor type list in Editor UI.(2/2)

When loading editor type list from Editor, overall number should
not be checked since the editor has already been added.
For the other cases we will keep it, just like the old logic.

BUG 25929524

Change-Id: I008c2777a62c652375a9c498e53e778e9358f904

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() {