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

Commit 8cb685f3 authored by Liana Kazanova (xWF)'s avatar Liana Kazanova (xWF) Committed by Android (Google) Code Review
Browse files

Revert "Defer showing the expanded view for bubble bar" 

Revert submission 28703070-bubbles-defer-expand

Reason for revert: DroidMonitor. Potential culprit for b/359765550 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Reverted changes: /q/submissionid:28703070-bubbles-defer-expand

Change-Id: I388a02ea73dbde6452696be8e7bbda6868af582c
parent 74b3e882

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

+9 −20
Original line number Diff line number Diff line
@@ -1997,10 +1997,15 @@ public class BubbleController implements ConfigurationChangeListener, 


        @Override

        public void expansionChanged(boolean isExpanded) {

            // in bubble bar mode, let the request to show the expanded view come from launcher.

            // only collapse here if we're collapsing.

            if (mLayerView != null && !isExpanded) {

            if (mLayerView != null) {

                if (!isExpanded) {

                    mLayerView.collapse();

                } else {

                    BubbleViewProvider selectedBubble = mBubbleData.getSelectedBubble();

                    if (selectedBubble != null) {

                        mLayerView.showExpandedView(selectedBubble);

                    }

                }

            }

        }
@@ -2146,13 +2151,6 @@ public class BubbleController implements ConfigurationChangeListener, 
        }

    };



    private void showExpandedViewForBubbleBar() {

        BubbleViewProvider selectedBubble = mBubbleData.getSelectedBubble();

        if (selectedBubble != null) {

            mLayerView.showExpandedView(selectedBubble);

        }

    }



    private void updateOverflowButtonDot() {

        BubbleOverflow overflow = mBubbleData.getOverflow();

        if (overflow == null) return;
@@ -2535,15 +2533,6 @@ public class BubbleController implements ConfigurationChangeListener, 
                if (mLayerView != null) mLayerView.updateExpandedView();

            });

        }



        @Override

        public void showExpandedView() {

            mMainExecutor.execute(() -> {

                if (mLayerView != null) {

                    showExpandedViewForBubbleBar();

                }

            });

        }

    }



    private class BubblesImpl implements Bubbles {

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/IBubbles.aidl

+0 −2
Original line number Diff line number Diff line
@@ -53,6 +53,4 @@ interface IBubbles { 
    oneway void showShortcutBubble(in ShortcutInfo info) = 12;



    oneway void showAppBubble(in Intent intent) = 13;



    oneway void showExpandedView() = 14;

}
 
 No newline at end of file