commit c23508e6e4740d798147f15c8ce1dff3395079bd
author Paul Soulos <psoulos@google.com> Fri Sep 12 12:23:22 2014 -0700
committer Paul Soulos <psoulos@google.com> Fri Sep 12 19:36:56 2014 +0000
tree ee2a56c7ec41ca54d090b4d8ae4643ff963e43fb
parent 95a5114bfbf6e48ac853702957bd26f2696de27e

Fixes duplicate badges and animating text

bug: 17480284
Change-Id: I58a6464ed71ad46557458d669acd7c32fc37b726

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;