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

Commit 42e9a9ba authored by Mady Mellor's avatar Mady Mellor Committed by Automerger Merge Worker
Browse files

Merge "Make sure we log the last bubble removal" into udc-dev am: 9edab49c am: 1d20242b 

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



Change-Id: Ic6b66b7b0e45628f39e802a4ac588d11ff55278f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6bf4f3e3 1d20242b

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

+2 −0
Original line number Diff line number Diff line
@@ -1791,6 +1791,7 @@ public class BubbleStackView extends FrameLayout 
                bubble.cleanupViews(); // cleans up the icon view

                updateExpandedView(); // resets state for no expanded bubble

            });

            logBubbleEvent(bubble, FrameworkStatsLog.BUBBLE_UICHANGED__ACTION__DISMISSED);

            return;

        }

        // Remove it from the views
@@ -1816,6 +1817,7 @@ public class BubbleStackView extends FrameLayout 
        // If a bubble is suppressed, it is not attached to the container. Clean it up.

        if (bubble.isSuppressed()) {

            bubble.cleanupViews();

            logBubbleEvent(bubble, FrameworkStatsLog.BUBBLE_UICHANGED__ACTION__DISMISSED);

        } else {

            Log.d(TAG, "was asked to remove Bubble, but didn't find the view! " + bubble);

        }