From d8c3328d4d9c5b3ffa95b0e9d45494bee07b8423 Mon Sep 17 00:00:00 2001 From: Liran Binyamin Date: Wed, 2 Oct 2024 12:21:41 -0400 Subject: [PATCH] Pass bubble flyout from wm shell to launcher Flag: com.android.wm.shell.enable_bubble_bar Bug: 277815200 Test: atest BubbleBarViewAnimatorTest Change-Id: I8666765937a491903c6fc042d2d629374be4c70d --- .../bubbles/testing/FakeBubbleViewFactory.kt | 14 +++++- .../taskbar/bubbles/BubbleViewTest.kt | 14 +++++- .../animation/BubbleBarViewAnimatorTest.kt | 48 ++++++++++++------- 3 files changed, 56 insertions(+), 20 deletions(-) diff --git a/quickstep/testing/com/android/launcher3/taskbar/bubbles/testing/FakeBubbleViewFactory.kt b/quickstep/testing/com/android/launcher3/taskbar/bubbles/testing/FakeBubbleViewFactory.kt index 37a07c3647..473d8ef559 100644 --- a/quickstep/testing/com/android/launcher3/taskbar/bubbles/testing/FakeBubbleViewFactory.kt +++ b/quickstep/testing/com/android/launcher3/taskbar/bubbles/testing/FakeBubbleViewFactory.kt @@ -54,7 +54,19 @@ object FakeBubbleViewFactory { val flags = if (suppressNotification) Notification.BubbleMetadata.FLAG_SUPPRESS_NOTIFICATION else 0 val bubbleInfo = - BubbleInfo(key, flags, null, null, 0, context.packageName, null, null, false, true) + BubbleInfo( + key, + flags, + null, + null, + 0, + context.packageName, + null, + null, + false, + true, + null, + ) val bubbleView = inflater.inflate(R.layout.bubblebar_item_view, parent, false) as BubbleView val dotPath = PathParser.createPathFromPathData( diff --git a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/bubbles/BubbleViewTest.kt b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/bubbles/BubbleViewTest.kt index 94f9cf5398..2caff01057 100644 --- a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/bubbles/BubbleViewTest.kt +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/bubbles/BubbleViewTest.kt @@ -65,7 +65,19 @@ class BubbleViewTest { overflowView.setOverflow(BubbleBarOverflow(overflowView), bitmap) val bubbleInfo = - BubbleInfo("key", 0, null, null, 0, context.packageName, null, null, false, true) + BubbleInfo( + "key", + 0, + null, + null, + 0, + context.packageName, + null, + null, + false, + true, + null, + ) bubbleView = inflater.inflate(R.layout.bubblebar_item_view, null, false) as BubbleView bubble = BubbleBarBubble(bubbleInfo, bubbleView, bitmap, bitmap, Color.WHITE, Path(), "") diff --git a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/bubbles/animation/BubbleBarViewAnimatorTest.kt b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/bubbles/animation/BubbleBarViewAnimatorTest.kt index 84e872da14..39131659be 100644 --- a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/bubbles/animation/BubbleBarViewAnimatorTest.kt +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/bubbles/animation/BubbleBarViewAnimatorTest.kt @@ -86,7 +86,7 @@ class BubbleBarViewAnimatorTest { bubbleBarView, bubbleStashController, onExpandedNoOp, - animatorScheduler + animatorScheduler, ) InstrumentationRegistry.getInstrumentation().runOnMainSync { @@ -135,7 +135,7 @@ class BubbleBarViewAnimatorTest { bubbleBarView, bubbleStashController, onExpandedNoOp, - animatorScheduler + animatorScheduler, ) InstrumentationRegistry.getInstrumentation().runOnMainSync { @@ -183,7 +183,7 @@ class BubbleBarViewAnimatorTest { bubbleBarView, bubbleStashController, onExpandedNoOp, - animatorScheduler + animatorScheduler, ) InstrumentationRegistry.getInstrumentation().runOnMainSync { @@ -228,7 +228,7 @@ class BubbleBarViewAnimatorTest { bubbleBarView, bubbleStashController, onExpandedNoOp, - animatorScheduler + animatorScheduler, ) InstrumentationRegistry.getInstrumentation().runOnMainSync { @@ -274,7 +274,7 @@ class BubbleBarViewAnimatorTest { bubbleBarView, bubbleStashController, onExpandedNoOp, - animatorScheduler + animatorScheduler, ) InstrumentationRegistry.getInstrumentation().runOnMainSync { @@ -311,7 +311,7 @@ class BubbleBarViewAnimatorTest { bubbleBarView, bubbleStashController, onExpanded, - animatorScheduler + animatorScheduler, ) InstrumentationRegistry.getInstrumentation().runOnMainSync { @@ -355,7 +355,7 @@ class BubbleBarViewAnimatorTest { bubbleBarView, bubbleStashController, onExpanded, - animatorScheduler + animatorScheduler, ) InstrumentationRegistry.getInstrumentation().runOnMainSync { @@ -405,7 +405,7 @@ class BubbleBarViewAnimatorTest { bubbleBarView, bubbleStashController, onExpanded, - animatorScheduler + animatorScheduler, ) InstrumentationRegistry.getInstrumentation().runOnMainSync { @@ -454,7 +454,7 @@ class BubbleBarViewAnimatorTest { bubbleBarView, bubbleStashController, onExpandedNoOp, - animatorScheduler + animatorScheduler, ) InstrumentationRegistry.getInstrumentation().runOnMainSync { @@ -504,7 +504,7 @@ class BubbleBarViewAnimatorTest { bubbleBarView, bubbleStashController, onExpanded, - animatorScheduler + animatorScheduler, ) InstrumentationRegistry.getInstrumentation().runOnMainSync { @@ -538,7 +538,7 @@ class BubbleBarViewAnimatorTest { bubbleBarView, bubbleStashController, onExpandedNoOp, - animatorScheduler + animatorScheduler, ) InstrumentationRegistry.getInstrumentation().runOnMainSync { @@ -577,7 +577,7 @@ class BubbleBarViewAnimatorTest { bubbleBarView, bubbleStashController, onExpanded, - animatorScheduler + animatorScheduler, ) InstrumentationRegistry.getInstrumentation().runOnMainSync { @@ -625,7 +625,7 @@ class BubbleBarViewAnimatorTest { bubbleBarView, bubbleStashController, onExpanded, - animatorScheduler + animatorScheduler, ) InstrumentationRegistry.getInstrumentation().runOnMainSync { @@ -666,7 +666,7 @@ class BubbleBarViewAnimatorTest { bubbleBarView, bubbleStashController, onExpandedNoOp, - animatorScheduler + animatorScheduler, ) InstrumentationRegistry.getInstrumentation().runOnMainSync { @@ -713,7 +713,7 @@ class BubbleBarViewAnimatorTest { bubbleBarView, bubbleStashController, onExpanded, - animatorScheduler + animatorScheduler, ) InstrumentationRegistry.getInstrumentation().runOnMainSync { @@ -760,7 +760,7 @@ class BubbleBarViewAnimatorTest { bubbleBarView, bubbleStashController, onExpanded, - animatorScheduler + animatorScheduler, ) InstrumentationRegistry.getInstrumentation().runOnMainSync { @@ -818,7 +818,7 @@ class BubbleBarViewAnimatorTest { bubbleBarView, bubbleStashController, onExpanded, - animatorScheduler + animatorScheduler, ) InstrumentationRegistry.getInstrumentation().runOnMainSync { @@ -870,7 +870,19 @@ class BubbleBarViewAnimatorTest { bubbleBarView.addView(overflowView) val bubbleInfo = - BubbleInfo("key", 0, null, null, 0, context.packageName, null, null, false, true) + BubbleInfo( + "key", + 0, + null, + null, + 0, + context.packageName, + null, + null, + false, + true, + null, + ) bubbleView = inflater.inflate(R.layout.bubblebar_item_view, bubbleBarView, false) as BubbleView bubble =