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

Commit 188cba77 authored by Ats Jenk's avatar Ats Jenk
Browse files

Log event when dragging bubble bar to dismiss 

Bug: 349845968
Test: atest BubblesTest
Flag: com.android.wm.shell.enable_bubble_bar
Change-Id: Id370a0e5079ef414bfd22c6e69936cc433dda926
parent 8d64d454

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

+3 −0
Original line number Diff line number Diff line
@@ -1759,6 +1759,9 @@ public class BubbleController implements ConfigurationChangeListener, 
    @MainThread

    public void removeAllBubbles(@Bubbles.DismissReason int reason) {

        mBubbleData.dismissAll(reason);

        if (reason == Bubbles.DISMISS_USER_GESTURE) {

            mLogger.log(BubbleLogger.Event.BUBBLE_BAR_DISMISSED_DRAG_BAR);

        }

    }



    private void onEntryAdded(BubbleEntry entry) {

packages/SystemUI/tests/src/com/android/systemui/wmshell/BubblesTest.java

+15 −0
Original line number Diff line number Diff line
@@ -2518,6 +2518,21 @@ public class BubblesTest extends SysuiTestCase { 
                eq(BubbleLogger.Event.BUBBLE_BAR_BUBBLE_DISMISSED_DRAG_BUBBLE));

    }



    @EnableFlags(FLAG_ENABLE_BUBBLE_BAR)

    @Test

    public void testEventLogging_bubbleBar_dragBarToDismiss() {

        mBubbleProperties.mIsBubbleBarEnabled = true;

        mPositioner.setIsLargeScreen(true);



        // Not a user gesture, should not log an event

        mBubbleController.removeAllBubbles(Bubbles.DISMISS_NO_LONGER_BUBBLE);

        verify(mBubbleLogger, never()).log(BubbleLogger.Event.BUBBLE_BAR_DISMISSED_DRAG_BAR);



        // Dismiss via user gesture, log an event

        mBubbleController.removeAllBubbles(Bubbles.DISMISS_USER_GESTURE);

        verify(mBubbleLogger).log(BubbleLogger.Event.BUBBLE_BAR_DISMISSED_DRAG_BAR);

    }



    /** Creates a bubble using the userId and package. */

    private Bubble createBubble(int userId, String pkg) {

        final UserHandle userHandle = new UserHandle(userId);