From 232db796aa4000655a90c1180e9fba9b411b594c Mon Sep 17 00:00:00 2001 From: Liran Binyamin Date: Mon, 18 Nov 2024 17:05:12 -0500 Subject: [PATCH] Fix bubble animation when swiping home When swiping home during the bubble animation, and if the show edu view state field is on, we try to show the bubble bar as part of preparing to show the edu view. This updates the stash state and prevents the animation from getting interrupted. The expected behavior around showing the edu view is to store the request when it is received and show the view later after the user taps on the bubble bar or the flyout to expand it. We shouldn't attempt to show the bubble bar at that point. Flag: com.android.wm.shell.enable_bubble_bar Fixes: 378967270 Bug: 374842575 Test: manual - force show the edu: adb shell settings put secure force_show_bubbles_user_education 1 - launch an app and send a bubble - while the bubble animates, swipe to go home - observe the flyout is removed correctly, and we don't end up in stashed state Change-Id: I478b06ac5f6f9d398cd143bcc0b3f796d9ad8a49 --- .../launcher3/taskbar/bubbles/BubbleBarViewController.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarViewController.java b/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarViewController.java index d842138e8b..d13e0c4d07 100644 --- a/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarViewController.java +++ b/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarViewController.java @@ -997,10 +997,9 @@ public class BubbleBarViewController { } } - /** Marks as should show education and shows the bubble bar in a collapsed state */ + /** Marks as should show education. */ public void prepareToShowEducation() { mShouldShowEducation = true; - mBubbleStashController.showBubbleBar(false /* expand the bubbles */); } /**