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

Commit b0682c45 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Always showContentVisibility(true) after switch/expand animations."... 

Merge "Always showContentVisibility(true) after switch/expand animations." into rvc-dev am: c7477974

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11932514

Change-Id: I29d692e4a804936ed7a740e0361df8e0b2db6e87
parents 2e075cfb c7477974

packages/SystemUI/src/com/android/systemui/bubbles/BubbleExpandedView.java

+5 −0
Original line number Diff line number Diff line
@@ -494,6 +494,11 @@ public class BubbleExpandedView extends LinearLayout { 
                    + " bubble=" + getBubbleKey());

        }

        final float alpha = visibility ? 1f : 0f;



        if (alpha == mActivityView.getAlpha()) {

            return;

        }



        mPointerView.setAlpha(alpha);

        if (mActivityView != null) {

            mActivityView.setAlpha(alpha);

packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java

+3 −0
Original line number Diff line number Diff line
@@ -1901,6 +1901,8 @@ public class BubbleStackView extends FrameLayout 
                                .withEndActions(() -> {

                                    if (mExpandedBubble != null

                                            && mExpandedBubble.getExpandedView() != null) {

                                        mExpandedBubble.getExpandedView()

                                                .setContentVisibility(true);

                                        mExpandedBubble.getExpandedView()

                                                .setSurfaceZOrderedOnTop(false);

                                    }
@@ -2045,6 +2047,7 @@ public class BubbleStackView extends FrameLayout 
                    })

                    .withEndActions(() -> {

                        if (mExpandedBubble != null && mExpandedBubble.getExpandedView() != null) {

                            mExpandedBubble.getExpandedView().setContentVisibility(true);

                            mExpandedBubble.getExpandedView().setSurfaceZOrderedOnTop(false);

                        }