commit dbb924c493b8fffd8f7f0d2172953ba5c2b2c7a5
author Android (Google) Code Review <android-gerrit@google.com> Fri Oct 09 00:47:19 2009 -0400
committer Android (Google) Code Review <android-gerrit@google.com> Fri Oct 09 00:47:19 2009 -0400
tree 68278670dbaac40d1788531751ac0ef5101f0b96
parent 4c82d3b7323b498e2a21daf94505daf0cd32d212
parent 753b74fd68a610cc30d1c7aa851aba58983ac566

Merge change I700622d9 into eclair

* changes:
  Fix up photo editing, and few other tweaks to contact editing.

src/com/android/contacts/model/ExternalSource.java

diff --git a/src/com/android/contacts/model/ExternalSource.java b/src/com/android/contacts/model/ExternalSource.java
index 743eb4e..d554c3a 100644
--- a/src/com/android/contacts/model/ExternalSource.java
+++ b/src/com/android/contacts/model/ExternalSource.java
@@ -164,11 +164,14 @@
                 final boolean detailSocialSummary = a.getBoolean(
                         com.android.internal.R.styleable.ContactsDataKind_detailSocialSummary,
                         false);
+
                 if (detailSocialSummary) {
                     // Inflate social summary when requested
                     kind.actionBodySocial = true;
-                } else {
-                    // Otherwise inflate specific column as summary
+                }
+
+                if (detailColumn != null) {
+                    // Inflate specific column as summary
                     kind.actionBody = new FallbackSource.SimpleInflater(detailColumn);
                 }