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

Commit ab02dfa7 authored by Ats Jenk's avatar Ats Jenk Committed by Android (Google) Code Review
Browse files

Merge "Move TestShellExecutor in multivalent to common" into main

parents 045ed26a 1079a692

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

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ import com.android.internal.protolog.ProtoLog 
import com.android.internal.statusbar.IStatusBarService

import com.android.wm.shell.Flags

import com.android.wm.shell.ShellTaskOrganizer

import com.android.wm.shell.TestShellExecutor

import com.android.wm.shell.bubbles.Bubbles.SysuiProxy

import com.android.wm.shell.bubbles.properties.ProdBubbleProperties

import com.android.wm.shell.bubbles.storage.BubblePersistentRepository
@@ -44,6 +43,7 @@ import com.android.wm.shell.common.DisplayInsetsController 
import com.android.wm.shell.common.FloatingContentCoordinator

import com.android.wm.shell.common.SyncTransactionQueue

import com.android.wm.shell.common.TaskStackListenerImpl

import com.android.wm.shell.common.TestShellExecutor

import com.android.wm.shell.draganddrop.DragAndDropController

import com.android.wm.shell.shared.TransactionPool

import com.android.wm.shell.shared.bubbles.BubbleBarLocation

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

+1 −1
Original line number Diff line number Diff line
@@ -36,10 +36,10 @@ import com.android.internal.protolog.ProtoLog 
import com.android.launcher3.icons.BubbleIconFactory

import com.android.wm.shell.Flags

import com.android.wm.shell.R

import com.android.wm.shell.TestShellExecutor

import com.android.wm.shell.bubbles.Bubbles.SysuiProxy

import com.android.wm.shell.bubbles.animation.AnimatableScaleMatrix

import com.android.wm.shell.common.FloatingContentCoordinator

import com.android.wm.shell.common.TestShellExecutor

import com.android.wm.shell.shared.animation.PhysicsAnimatorTestUtils

import com.google.common.truth.Truth.assertThat

import com.google.common.util.concurrent.MoreExecutors.directExecutor

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

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ import com.android.internal.protolog.ProtoLog 
import com.android.internal.statusbar.IStatusBarService

import com.android.launcher3.icons.BubbleIconFactory

import com.android.wm.shell.ShellTaskOrganizer

import com.android.wm.shell.TestShellExecutor

import com.android.wm.shell.bubbles.properties.BubbleProperties

import com.android.wm.shell.bubbles.storage.BubblePersistentRepository

import com.android.wm.shell.common.DisplayController
@@ -44,6 +43,7 @@ import com.android.wm.shell.common.DisplayInsetsController 
import com.android.wm.shell.common.FloatingContentCoordinator

import com.android.wm.shell.common.SyncTransactionQueue

import com.android.wm.shell.common.TaskStackListenerImpl

import com.android.wm.shell.common.TestShellExecutor

import com.android.wm.shell.shared.TransactionPool

import com.android.wm.shell.sysui.ShellCommandHandler

import com.android.wm.shell.sysui.ShellController

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

+1 −1
Original line number Diff line number Diff line
@@ -22,9 +22,9 @@ import android.content.res.Resources 
import android.view.LayoutInflater

import com.android.internal.logging.testing.UiEventLoggerFake

import com.android.wm.shell.R

import com.android.wm.shell.TestShellExecutor

import com.android.wm.shell.bubbles.BubbleViewInfoTask.BubbleViewInfo

import com.android.wm.shell.bubbles.bar.BubbleBarExpandedView

import com.android.wm.shell.common.TestShellExecutor

import com.google.common.util.concurrent.MoreExecutors.directExecutor



/** Helper to create a [Bubble] instance */

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

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ import androidx.test.filters.SmallTest 
import androidx.test.platform.app.InstrumentationRegistry.getInstrumentation

import com.android.internal.logging.testing.UiEventLoggerFake

import com.android.internal.protolog.ProtoLog

import com.android.wm.shell.TestShellExecutor

import com.android.wm.shell.bubbles.Bubble

import com.android.wm.shell.bubbles.BubbleExpandedViewManager

import com.android.wm.shell.bubbles.BubbleLogger
@@ -46,6 +45,7 @@ import com.android.wm.shell.bubbles.BubbleTaskView 
import com.android.wm.shell.bubbles.DeviceConfig

import com.android.wm.shell.bubbles.FakeBubbleExpandedViewManager

import com.android.wm.shell.bubbles.FakeBubbleFactory

import com.android.wm.shell.common.TestShellExecutor

import com.android.wm.shell.taskview.TaskView

import com.android.wm.shell.taskview.TaskViewTaskController

import com.google.common.truth.Truth.assertThat