From 4c82d3b7323b498e2a21daf94505daf0cd32d212 Mon Sep 17 00:00:00 2001 From: Jeff Sharkey Date: Thu, 8 Oct 2009 16:57:06 -0700 Subject: [PATCH] Handle external sources that request both social and detail. When a source requests social summary, allow them to still provide a fallback detail value when no social summary is available. (Otherwise the data row would be invisible.) Partially fixes http://b/2176892 --- src/com/android/contacts/model/ExternalSource.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) 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 @@ public class ExternalSource extends FallbackSource { 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); } -- 2.11.0