commit 4cfb48a7e14bd5a5988ce3abefb08a8a6bc0eee2
author Brian Attwell <brianattwell@google.com> Fri Jul 18 03:14:17 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Jul 18 03:14:17 2014 +0000
tree d46430607fc12ec14a05e600fd52ab403e494164
parent 814c31281d058d0b075e4efafd56bffa967310ab
parent 5cfe760b91b0646fcb9c89419f8cd279f448f462

am 5cfe760b: am b97a585d: am bbd22018: Inline "select new contact" entry in picker

* commit '5cfe760b91b0646fcb9c89419f8cd279f448f462':
  Inline "select new contact" entry in picker

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 e453a4b..0dab2cf 100644
--- a/src/com/android/contacts/quickcontact/QuickContactActivity.java
+++ b/src/com/android/contacts/quickcontact/QuickContactActivity.java
@@ -807,7 +807,7 @@
         if (contactCardEntries.size() > 0) {
             mContactCard.initialize(contactCardEntries,
                     /* numInitialVisibleEntries = */ MIN_NUM_CONTACT_ENTRIES_SHOWN,
-                    /* isExpanded = */ false,
+                    /* isExpanded = */ mContactCard.isExpanded(),
                     mExpandingEntryCardViewListener);
             mContactCard.setVisibility(View.VISIBLE);
         } else {
@@ -1498,7 +1498,7 @@
         if (allInteractions.size() > 0) {
             mRecentCard.initialize(interactionsWrapper,
                     /* numInitialVisibleEntries = */ MIN_NUM_COLLAPSED_RECENT_ENTRIES_SHOWN,
-                    /* isExpanded = */ false, mExpandingEntryCardViewListener);
+                    /* isExpanded = */ mRecentCard.isExpanded(), mExpandingEntryCardViewListener);
             mRecentCard.setVisibility(View.VISIBLE);
         }