| commit | c1b68ef6d6a6d7bfa81493ba8b67870662d90870 | [log] [tgz] |
|---|---|---|
| author | Ats Jenk <atsjenk@google.com> | Tue Nov 05 16:37:38 2024 -0800 |
| committer | Ats Jenk <atsjenk@google.com> | Wed Nov 06 09:27:01 2024 -0800 |
| tree | 876014285e60de083bb6ec104443246e5b32e9cf | |
| parent | a36924d786c89b2e66960d6ce16af187bcce8415 [diff] |
Log event when tapping on do not bubble convo Bug: 349845968 Test: atest BubbleBarExpandedViewTest Flag: com.android.wm.shell.enable_bubble_bar Change-Id: Ib8b3a874febad012fd25ee1d376959261d5c6e1e
diff --git a/libs/WindowManager/Shell/multivalentTests/src/com/android/wm/shell/bubbles/bar/BubbleBarExpandedViewTest.kt b/libs/WindowManager/Shell/multivalentTests/src/com/android/wm/shell/bubbles/bar/BubbleBarExpandedViewTest.kt index d4d6bf3..0d742cc 100644 --- a/libs/WindowManager/Shell/multivalentTests/src/com/android/wm/shell/bubbles/bar/BubbleBarExpandedViewTest.kt +++ b/libs/WindowManager/Shell/multivalentTests/src/com/android/wm/shell/bubbles/bar/BubbleBarExpandedViewTest.kt
@@ -242,6 +242,18 @@ assertThat(uiEventLoggerFake.logs[0]).hasBubbleInfo(bubble) } + @Test + fun testEventLogging_unBubbleConversation() { + getInstrumentation().runOnMainSync { bubbleExpandedView.handleView.performClick() } + val menuItem = bubbleExpandedView.menuView() + .actionViewWithText(context.getString(R.string.bubbles_dont_bubble_conversation)) + getInstrumentation().runOnMainSync { menuItem.performClick() } + assertThat(uiEventLoggerFake.numLogs()).isEqualTo(1) + assertThat(uiEventLoggerFake.logs[0].eventId) + .isEqualTo(BubbleLogger.Event.BUBBLE_BAR_APP_MENU_OPT_OUT.id) + assertThat(uiEventLoggerFake.logs[0]).hasBubbleInfo(bubble) + } + private fun BubbleBarExpandedView.menuView(): BubbleBarMenuView { return findViewByPredicate { it is BubbleBarMenuView } }
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/BubbleBarExpandedView.java b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/BubbleBarExpandedView.java index 348374f..2a50e4d0 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/BubbleBarExpandedView.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/BubbleBarExpandedView.java
@@ -241,6 +241,7 @@ if (mListener != null) { mListener.onUnBubbleConversation(bubble.getKey()); } + mBubbleLogger.log(bubble, BubbleLogger.Event.BUBBLE_BAR_APP_MENU_OPT_OUT); } @Override