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

Commit 6d002031 authored by Mady Mellor's avatar Mady Mellor
Browse files

Only populate activity view when we're showing it 

Follow up comments from ag/6274141

Test: manual - expand and collapse some activity view based bubbles
      atest BubbleTestController
Bug: 123543995
Change-Id: I9024f074bdf91e9d2955bdb1007fb55c48e35c21
parent 61dac1aa

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

+10 −2
Original line number Diff line number Diff line
@@ -107,9 +107,11 @@ public class BubbleExpandedView extends LinearLayout implements View.OnClickList 
    private ActivityView.StateCallback mStateCallback = new ActivityView.StateCallback() {

        @Override

        public void onActivityViewReady(ActivityView view) {

            if (!mActivityViewReady) {

                mActivityViewReady = true;

                mActivityView.startActivity(mBubbleIntent);

            }

        }



        @Override

        public void onActivityViewDestroyed(ActivityView view) {
@@ -262,6 +264,12 @@ public class BubbleExpandedView extends LinearLayout implements View.OnClickList 
        updateHeaderView();

        updatePermissionView();

        updateExpandedView();

    }



    /**

     * Lets activity view know it should be shown / populated.

     */

    public void populateActivityView() {

        mActivityView.setCallback(mStateCallback);

    }

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

+1 −0
Original line number Diff line number Diff line
@@ -707,6 +707,7 @@ public class BubbleStackView extends FrameLayout implements BubbleTouchHandler.F 
        mExpandedViewContainer.removeAllViews();

        if (mExpandedBubble != null && mIsExpanded) {

            mExpandedViewContainer.addView(mExpandedBubble.expandedView);

            mExpandedBubble.expandedView.populateActivityView();

            mExpandedViewContainer.setVisibility(mIsExpanded ? VISIBLE : GONE);

        }

    }