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

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

Merge "Make sure to update the manage button click listener after rotation"... 

Merge "Make sure to update the manage button click listener after rotation" into tm-dev am: e8756a56

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



Change-Id: Icdca8b172ad1eec0421e1413053e6c31b4f72738
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 475908ca e8756a56

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

+13 −2
Original line number Diff line number Diff line
@@ -1139,6 +1139,7 @@ public class BubbleStackView extends FrameLayout 
        // The menu itself should respect locale direction so the icons are on the correct side.

        mManageMenu.setLayoutDirection(LAYOUT_DIRECTION_LOCALE);

        addView(mManageMenu);

        updateManageButtonListener();

    }



    /**
@@ -1315,7 +1316,6 @@ public class BubbleStackView extends FrameLayout 
    /** Respond to the display size change by recalculating view size and location. */

    public void onDisplaySizeChanged() {

        updateOverflow();

        setUpManageMenu();

        setUpFlyout();

        setUpDismissView();

        updateUserEdu();
@@ -1344,6 +1344,7 @@ public class BubbleStackView extends FrameLayout 
        if (mIsExpanded) {

            updateExpandedView();

        }

        setUpManageMenu();

    }



    @Override
@@ -2814,7 +2815,7 @@ public class BubbleStackView extends FrameLayout 
                // a race condition with adding the BubbleExpandedView view to the expanded view

                // container. Due to the race condition the click handler sometimes is not set up

                // correctly and is never called.

                bev.setManageClickListener((view) -> showManageMenu(true /* show */));

                updateManageButtonListener();

            }, 0);



            if (!mIsExpansionAnimating) {
@@ -2825,6 +2826,16 @@ public class BubbleStackView extends FrameLayout 
        }

    }



    private void updateManageButtonListener() {

        if (mIsExpanded && mExpandedBubble != null

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

            BubbleExpandedView bev = mExpandedBubble.getExpandedView();

            bev.setManageClickListener((view) -> {

                showManageMenu(true /* show */);

            });

        }

    }



    /**

     * Requests a snapshot from the currently expanded bubble's TaskView and displays it in a

     * SurfaceView. This allows us to load a newly expanded bubble's Activity into the TaskView,