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

Commit f4d2b4d4 authored by Mady Mellor's avatar Mady Mellor Committed by Automerger Merge Worker
Browse files

Merge "Fix possible NPE" into sc-v2-dev am: d76f9c19 am: 04b46aed 

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

Change-Id: I28c9bf16b1754aabd5c0ee423a610d44d8923863
parents 2e6243d9 04b46aed

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleFlyoutView.java

+2 −1
Original line number Diff line number Diff line
@@ -231,8 +231,9 @@ public class BubbleFlyoutView extends FrameLayout { 
     * Fade animation for consecutive flyouts.

     */

    void animateUpdate(Bubble.FlyoutMessage flyoutMessage, PointF stackPos,

            boolean hideDot, Runnable onHide) {

            boolean hideDot, float[] dotCenter, Runnable onHide) {

        mOnHide = onHide;

        mDotCenter = dotCenter;

        final Runnable afterFadeOut = () -> {

            updateFlyoutMessage(flyoutMessage);

            // Wait for TextViews to layout with updated height.

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleStackView.java

+1 −0
Original line number Diff line number Diff line
@@ -2516,6 +2516,7 @@ public class BubbleStackView extends FrameLayout 
            if (mFlyout.getVisibility() == View.VISIBLE) {

                mFlyout.animateUpdate(bubble.getFlyoutMessage(),

                        mStackAnimationController.getStackPosition(), !bubble.showDot(),

                        bubble.getIconView().getDotCenter(),

                        mAfterFlyoutHidden /* onHide */);

            } else {

                mFlyout.setVisibility(INVISIBLE);