commit 0b85aed7ae694341ea226c88bf10c0e11ea990ce
author Dmitri Plotnikov <dplotnikov@google.com> Fri Sep 17 10:35:47 2010 -0700
committer Dmitri Plotnikov <dplotnikov@google.com> Fri Sep 17 10:35:47 2010 -0700
tree b12827e2697d5d3ce4bcd98b7207793d8ce1cb09
parent 5732714b3ed03bad46b7d4b68d46b88cbc300df5

Fixing switching between long and short name forms in Exch

Change-Id: I4b8bb61a23f147b9f26419e3466c9266f70e1b3d

src/com/android/contacts/views/editor/ContactEditorFragment.java

diff --git a/src/com/android/contacts/views/editor/ContactEditorFragment.java b/src/com/android/contacts/views/editor/ContactEditorFragment.java
index 51d963a..e0acf44 100644
--- a/src/com/android/contacts/views/editor/ContactEditorFragment.java
+++ b/src/com/android/contacts/views/editor/ContactEditorFragment.java
@@ -1033,10 +1033,12 @@
 
         switch (request) {
             case EditorListener.EDITOR_FORM_CHANGED:
-                if (nameEditor.areOptionalFieldsVisible()) {
-                    switchFromFullNameToStructuredName(nameEditor);
-                } else {
-                    switchFromStructuredNameToFullName(nameEditor);
+                if (nameEditor.hasShortAndLongForms()) {
+                    if (nameEditor.areOptionalFieldsVisible()) {
+                        switchFromFullNameToStructuredName(nameEditor);
+                    } else {
+                        switchFromStructuredNameToFullName(nameEditor);
+                    }
                 }
                 break;