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

Commit c706e810 authored by Liran Binyamin's avatar Liran Binyamin Committed by Android (Google) Code Review
Browse files

Merge "Inject BubbleLogger into BubbleBarExpandedView" into main

parents 6af5ded9 591c3bab

libs/WindowManager/Shell/multivalentTests/src/com/android/wm/shell/bubbles/BubbleStackViewTest.kt

+0 −1
Original line number Diff line number Diff line
@@ -685,7 +685,6 @@ class BubbleStackViewTest { 
            expandedViewManager,

            bubbleTaskViewFactory,

            positioner,

            bubbleLogger,

            bubbleStackView,

            null,

            iconFactory,

libs/WindowManager/Shell/multivalentTests/src/com/android/wm/shell/bubbles/BubbleViewInfoTaskTest.kt

+0 −1
Original line number Diff line number Diff line
@@ -327,7 +327,6 @@ class BubbleViewInfoTaskTest { 
            expandedViewManager,

            bubbleTaskViewFactory,

            bubblePositioner,

            bubbleLogger,

            bubbleStackView,

            null /* layerView */,

            iconFactory,

libs/WindowManager/Shell/multivalentTests/src/com/android/wm/shell/bubbles/FakeBubbleFactory.kt

+1 −1
Original line number Diff line number Diff line
@@ -45,10 +45,10 @@ class FakeBubbleFactory { 
                        .inflate(R.layout.bubble_bar_expanded_view, null, false /* attachToRoot */)

                        as BubbleBarExpandedView)

                    .apply {

                        this.bubbleLogger = bubbleLogger

                        initialize(

                            expandedViewManager,

                            bubblePositioner,

                            bubbleLogger,

                            false, /* isOverflow */

                            bubbleTaskView,

                            mainExecutor,

libs/WindowManager/Shell/multivalentTests/src/com/android/wm/shell/bubbles/bar/BubbleBarAnimationHelperTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -358,7 +358,7 @@ class BubbleBarAnimationHelperTest { 


    private fun createOverflow(): BubbleOverflow {

        val overflow = BubbleOverflow(context, bubblePositioner)

        overflow.initializeForBubbleBar(expandedViewManager, bubblePositioner, bubbleLogger)

        overflow.initializeForBubbleBar(expandedViewManager, bubblePositioner)

        return overflow

    }

libs/WindowManager/Shell/multivalentTests/src/com/android/wm/shell/bubbles/bar/BubbleBarExpandedViewTest.kt

+1 −3
Original line number Diff line number Diff line
@@ -114,10 +114,10 @@ class BubbleBarExpandedViewTest { 
        bubbleExpandedView = inflater.inflate(

            R.layout.bubble_bar_expanded_view, null, false /* attachToRoot */

        ) as BubbleBarExpandedView

        bubbleExpandedView.bubbleLogger = BubbleLogger(uiEventLoggerFake)

        bubbleExpandedView.initialize(

            expandedViewManager,

            positioner,

            BubbleLogger(uiEventLoggerFake),

            false /* isOverflow */,

            bubbleTaskView,

            mainExecutor,
@@ -279,7 +279,6 @@ class BubbleBarExpandedViewTest { 
        expandedView.initialize(

            expandedViewManager,

            positioner,

            BubbleLogger(uiEventLoggerFake),

            false /* isOverflow */,

            taskView,

            mainExecutor,
@@ -321,7 +320,6 @@ class BubbleBarExpandedViewTest { 
        expandedView.initialize(

            expandedViewManager,

            positioner,

            BubbleLogger(uiEventLoggerFake),

            false /* isOverflow */,

            taskView,

            mainExecutor,