commit 7eb4285b55cb3e338c7fa5fc3740d974f0663dd7
author Paul Soulos <psoulos@google.com> Sat Sep 13 02:22:03 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Sat Sep 13 02:22:03 2014 +0000
tree ee2a56c7ec41ca54d090b4d8ae4643ff963e43fb
parent b498f7749d4373acfbdb4670460c209bded9c41d
parent ffa59ee855f9a59080dc1b4d1afbb22f72a31bc7

am ffa59ee8: am b189cac5: am c23508e6: Fixes duplicate badges and animating text

* commit 'ffa59ee855f9a59080dc1b4d1afbb22f72a31bc7':
  Fixes duplicate badges and animating text

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

diff --git a/src/com/android/contacts/quickcontact/ExpandingEntryCardView.java b/src/com/android/contacts/quickcontact/ExpandingEntryCardView.java
index 1313e24..f40ebe7 100644
--- a/src/com/android/contacts/quickcontact/ExpandingEntryCardView.java
+++ b/src/com/android/contacts/quickcontact/ExpandingEntryCardView.java
@@ -728,7 +728,6 @@
     private void updateBadges() {
         if (mIsExpanded) {
             mBadgeContainer.removeAllViews();
-            mBadgeIds.clear();
         } else {
             // Inflate badges if not yet created
             if (mBadges.size() < mEntries.size() - mCollapsedEntriesCount) {
@@ -829,6 +828,8 @@
         transitionSet.addTransition(boundsTransition);
         transitionSet.addTransition(scrollTransition);
 
+        transitionSet.excludeTarget(R.id.text, /* exclude = */ true);
+
         final ViewGroup transitionViewContainer = mAnimationViewGroup == null ?
                 this : mAnimationViewGroup;