Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8e974330 authored by Paul Soulos's avatar Paul Soulos Committed by Android Git Automerger
Browse files

am c23508e6: Fixes duplicate badges and animating text 

* commit 'c23508e6':
  Fixes duplicate badges and animating text
parents 74f2872f c23508e6

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

+2 −1
Original line number Diff line number Diff line
@@ -728,7 +728,6 @@ public class ExpandingEntryCardView extends CardView { 
    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 @@ public class ExpandingEntryCardView extends CardView { 
        transitionSet.addTransition(boundsTransition);

        transitionSet.addTransition(scrollTransition);



        transitionSet.excludeTarget(R.id.text, /* exclude = */ true);



        final ViewGroup transitionViewContainer = mAnimationViewGroup == null ?

                this : mAnimationViewGroup;