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
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);
}