Merge "Revert "Defer showing the expanded view for bubble bar"" into main
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleController.java
index b28b218..29520ef 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleController.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleController.java
@@ -1997,10 +1997,15 @@
@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) {
- mLayerView.collapse();
+ if (mLayerView != null) {
+ if (!isExpanded) {
+ mLayerView.collapse();
+ } else {
+ BubbleViewProvider selectedBubble = mBubbleData.getSelectedBubble();
+ if (selectedBubble != null) {
+ mLayerView.showExpandedView(selectedBubble);
+ }
+ }
}
}
@@ -2146,13 +2151,6 @@
}
};
- 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 @@
if (mLayerView != null) mLayerView.updateExpandedView();
});
}
-
- @Override
- public void showExpandedView() {
- mMainExecutor.execute(() -> {
- if (mLayerView != null) {
- showExpandedViewForBubbleBar();
- }
- });
- }
}
private class BubblesImpl implements Bubbles {
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/IBubbles.aidl b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/IBubbles.aidl
index 5779a8f..5c78974 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/IBubbles.aidl
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/IBubbles.aidl
@@ -53,6 +53,4 @@
oneway void showShortcutBubble(in ShortcutInfo info) = 12;
oneway void showAppBubble(in Intent intent) = 13;
-
- oneway void showExpandedView() = 14;
}
\ No newline at end of file