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

Commit 4594603f authored by Steve Elliott's avatar Steve Elliott
Browse files

Fix alignment of expanded bundled group convo avatar 

Fixes: 159043203
Test: manual
Change-Id: If8d5b906d79c9dfcc5e99d8162f73d0f7d09e6e1
parent 7da4bccd

core/java/com/android/internal/widget/ConversationLayout.java

+9 −2
Original line number Diff line number Diff line
@@ -233,13 +233,20 @@ public class ConversationLayout extends FrameLayout 
            oldVisibility = mImportanceRingView.getVisibility();

            wasGone = oldVisibility == GONE;

            visibility = !mImportantConversation ? GONE : visibility;

            isGone = visibility == GONE;

            if (wasGone != isGone) {

            boolean isRingGone = visibility == GONE;

            if (wasGone != isRingGone) {

                // Keep the badge visibility in sync with the icon. This is necessary in cases

                // Where the icon is being hidden externally like in group children.

                mImportanceRingView.animate().cancel();

                mImportanceRingView.setVisibility(visibility);

            }



            oldVisibility = mConversationIconBadge.getVisibility();

            wasGone = oldVisibility == GONE;

            if (wasGone != isGone) {

                mConversationIconBadge.animate().cancel();

                mConversationIconBadge.setVisibility(visibility);

            }

        });

        // When the small icon is gone, hide the rest of the badge

        mIcon.setOnForceHiddenChangedListener((forceHidden) -> {