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

Commit cc5ec229 authored by Paul Soulos's avatar Paul Soulos
Browse files

Makes the expand/collapse animation more fluid. 

This is accomplished by having separators move instead of fade in and out.

Bug: 16680415
Change-Id: I925bb978811680f4ee1418441ebda38db77cc5c7
parent 3b09d33c

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

+30 −6
Original line number Diff line number Diff line
@@ -201,6 +201,11 @@ public class ExpandingEntryCardView extends CardView { 
    private ViewGroup mAnimationViewGroup;

    private LinearLayout mBadgeContainer;

    private final List<ImageView> mBadges;

    /**

     * List to hold the separators. This saves us from reconstructing every expand/collapse and

     * provides a smoother animation.

     */

    private List<View> mSeparators;

    private LinearLayout mContainer;



    private final OnClickListener mExpandCollapseButtonListener = new OnClickListener() {
@@ -259,6 +264,10 @@ public class ExpandingEntryCardView extends CardView { 
            mEntryViews.add(new ArrayList<View>());

        }

        mCollapsedEntriesCount = Math.min(numInitialVisibleEntries, mNumEntries);

        // We need a separator between each list, but not after the last one

        if (entries.size() > 1) {

            mSeparators = new ArrayList<>(entries.size() - 1);

        }

        mListener = listener;

        mAnimationViewGroup = animationViewGroup;
@@ -311,9 +320,17 @@ public class ExpandingEntryCardView extends CardView { 
        mEntriesViewGroup.removeAllViews();



        if (mIsExpanded) {

            for (List<View> viewList : mEntryViews) {

                if (viewList != mEntryViews.get(0)) {

                    addSeparator(viewList.get(0));

            for (int i = 0; i < mEntryViews.size(); i++) {

                List<View> viewList = mEntryViews.get(i);

                if (i > 0) {

                    View separator;

                    if (mSeparators.size() <= i - 1) {

                        separator = generateSeparator(viewList.get(0));

                        mSeparators.add(separator);

                    } else {

                        separator = mSeparators.get(i - 1);

                    }

                    mEntriesViewGroup.addView(separator);

                }

                for (View view : viewList) {

                    addEntry(view);
@@ -329,7 +346,14 @@ public class ExpandingEntryCardView extends CardView { 
                    i++) {

                List<View> entryViewList = mEntryViews.get(i);

                if (i > 0) {

                    addSeparator(entryViewList.get(0));

                    View separator;

                    if (mSeparators.size() <= i - 1) {

                        separator = generateSeparator(entryViewList.get(0));

                        mSeparators.add(separator);

                    } else {

                        separator = mSeparators.get(i - 1);

                    }

                    mEntriesViewGroup.addView(separator);

                }

                addEntry(entryViewList.get(0));

                numInViewGroup++;
@@ -367,7 +391,7 @@ public class ExpandingEntryCardView extends CardView { 
        mEntriesViewGroup.addView(entry);

    }



    private void addSeparator(View entry) {

    private View generateSeparator(View entry) {

        View separator = new View(getContext());

        Resources res = getResources();
@@ -389,7 +413,7 @@ public class ExpandingEntryCardView extends CardView { 
        }

        layoutParams.setMarginStart(marginStart);

        separator.setLayoutParams(layoutParams);

        mEntriesViewGroup.addView(separator);

        return separator;

    }



    private CharSequence getExpandButtonText() {

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

+8 −6
Original line number Diff line number Diff line
@@ -953,12 +953,14 @@ public class QuickContactActivity extends ContactsActivity { 
            mAboutCard.setTitle(customAboutCardName);

        }



        if (aboutCardEntries.size() > 0) {

            mAboutCard.initialize(aboutCardEntries,

                    /* numInitialVisibleEntries = */ 1,

                    /* isExpanded = */ true,

                    /* isAlwaysExpanded = */ true,

                    mExpandingEntryCardViewListener,

                    mScroller);

        }



        if (contactCardEntries.size() == 0 && aboutCardEntries.size() == 0) {

            initializeNoContactDetailCard();