summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWalter Jang <wjang@google.com>2015-05-26 11:11:21 -0700
committerWalter Jang <wjang@google.com>2015-05-26 11:59:40 -0700
commitf5877e3eb34d3a2cf474a4087143eca9fd7c38ea (patch)
treed71ef931164cc21e619392b1098b39b769a63572
parent66a2e93d7475ea9346b32b66bce928c0b0553717 (diff)
downloadpackages_apps_Contacts-f5877e3eb34d3a2cf474a4087143eca9fd7c38ea.tar.gz
packages_apps_Contacts-f5877e3eb34d3a2cf474a4087143eca9fd7c38ea.tar.bz2
packages_apps_Contacts-f5877e3eb34d3a2cf474a4087143eca9fd7c38ea.zip
Expanded name not passed to full editor for inserts
Bug 19624360 Change-Id: Ia1166655d12748129f1281b102c95c1583380d5c
-rw-r--r--src/com/android/contacts/editor/StructuredNameEditorView.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/contacts/editor/StructuredNameEditorView.java b/src/com/android/contacts/editor/StructuredNameEditorView.java
index 0f98f53a4..5f764f925 100644
--- a/src/com/android/contacts/editor/StructuredNameEditorView.java
+++ b/src/com/android/contacts/editor/StructuredNameEditorView.java
@@ -213,7 +213,10 @@ public class StructuredNameEditorView extends TextFieldsEditorView {
public String getDisplayName() {
final ValuesDelta valuesDelta = getValues();
if (hasShortAndLongForms() && areOptionalFieldsVisible()) {
- return valuesDelta.getDisplayName();
+ final String displayName = valuesDelta.getDisplayName();
+ if (!TextUtils.isEmpty(displayName)) {
+ return displayName;
+ }
}
final Map<String, String> structuredNameMap = valuesToStructuredNameMap(valuesDelta);
final String displayName = NameConverter.structuredNameToDisplayName(