commit c8e2a91807b581194566eb45019fa16e2268b462
author Paul Soulos <psoulos@google.com> Mon Jul 21 14:52:20 2014 -0700
committer Paul Soulos <psoulos@google.com> Mon Jul 21 14:52:20 2014 -0700
tree b7baa4d7edd495e614cd19df500decf7d7c87994
parent 89966b4ed8cc9d385e5ac6b4a7e9e08ada387eb0

Fixes rebase bug

Change-Id: I1084054758bb6d4fcc0bdb1ed4da77532b99eec6

src/com/android/contacts/quickcontact/QuickContactActivity.java

diff --git a/src/com/android/contacts/quickcontact/QuickContactActivity.java b/src/com/android/contacts/quickcontact/QuickContactActivity.java
index e74d30f..45b49c6 100644
--- a/src/com/android/contacts/quickcontact/QuickContactActivity.java
+++ b/src/com/android/contacts/quickcontact/QuickContactActivity.java
@@ -806,7 +806,7 @@
         if (contactCardEntries.size() > 0) {
             mContactCard.initialize(contactCardEntries,
                     /* numInitialVisibleEntries = */ MIN_NUM_CONTACT_ENTRIES_SHOWN,
-                    /* isExpanded = */ false,
+                    /* isExpanded = */ mContactCard.isExpanded(),
                     /* isAlwaysExpanded = */ false,
                     mExpandingEntryCardViewListener);
             mContactCard.setVisibility(View.VISIBLE);
@@ -867,7 +867,7 @@
                 R.color.quickcontact_entry_sub_header_text_color);
         final PorterDuffColorFilter greyColorFilter =
                 new PorterDuffColorFilter(subHeaderTextColor, PorterDuff.Mode.SRC_ATOP);
-        mNoContactDetailsCard.initialize(promptEntries, 2, /* isExpanded = */ false,
+        mNoContactDetailsCard.initialize(promptEntries, 2, /* isExpanded = */ true,
                 /* isAlwaysExpanded = */ true, mExpandingEntryCardViewListener);
         mNoContactDetailsCard.setVisibility(View.VISIBLE);
         mNoContactDetailsCard.setEntryHeaderColor(subHeaderTextColor);
@@ -1504,7 +1504,7 @@
         if (allInteractions.size() > 0) {
             mRecentCard.initialize(interactionsWrapper,
                     /* numInitialVisibleEntries = */ MIN_NUM_COLLAPSED_RECENT_ENTRIES_SHOWN,
-                    /* isExpanded = */ false, /* isAlwaysExpanded = */ false,
+                    /* isExpanded = */ mRecentCard.isExpanded(), /* isAlwaysExpanded = */ false,
                     mExpandingEntryCardViewListener);
             mRecentCard.setVisibility(View.VISIBLE);
         }