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

Commit 2025a585 authored Jan 30, 2025 by Liran Binyamin Committed by Android (Google) Code Review Jan 30, 2025

Merge "Move DeviceConfig to wm.shell.shared.bubbles" into main

parents e9c2327c 936d1823

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -47,6 +47,7 @@ import com.android.wm.shell.draganddrop.DragAndDropController
		import com.android.wm.shell.shared.TransactionPool
		import com.android.wm.shell.shared.bubbles.BubbleBarLocation
		import com.android.wm.shell.shared.bubbles.BubbleBarUpdate
		import com.android.wm.shell.shared.bubbles.DeviceConfig
		import com.android.wm.shell.sysui.ShellCommandHandler
		import com.android.wm.shell.sysui.ShellController
		import com.android.wm.shell.sysui.ShellInit

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -31,6 +31,7 @@ import com.android.internal.protolog.ProtoLog
		import com.android.wm.shell.R
		import com.android.wm.shell.bubbles.BubblePositioner.MAX_HEIGHT
		import com.android.wm.shell.shared.bubbles.BubbleBarLocation
		import com.android.wm.shell.shared.bubbles.DeviceConfig
		import com.google.common.truth.Truth.assertThat
		import com.google.common.util.concurrent.MoreExecutors.directExecutor
		import org.junit.Before

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -42,10 +42,10 @@ import com.android.wm.shell.bubbles.BubbleLogger
		import com.android.wm.shell.bubbles.BubbleOverflow
		import com.android.wm.shell.bubbles.BubblePositioner
		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.shared.bubbles.DeviceConfig
		import com.android.wm.shell.taskview.TaskView
		import com.android.wm.shell.taskview.TaskViewController
		import com.android.wm.shell.taskview.TaskViewTaskController

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -39,11 +39,11 @@ import com.android.wm.shell.bubbles.BubbleLogger
		import com.android.wm.shell.bubbles.BubblePositioner
		import com.android.wm.shell.bubbles.BubbleTaskView
		import com.android.wm.shell.bubbles.BubbleTaskViewFactory
		import com.android.wm.shell.bubbles.DeviceConfig
		import com.android.wm.shell.bubbles.FakeBubbleExpandedViewManager
		import com.android.wm.shell.bubbles.RegionSamplingProvider
		import com.android.wm.shell.bubbles.UiEventSubject.Companion.assertThat
		import com.android.wm.shell.common.TestShellExecutor
		import com.android.wm.shell.shared.bubbles.DeviceConfig
		import com.android.wm.shell.shared.handles.RegionSamplingHelper
		import com.android.wm.shell.taskview.TaskView
		import com.android.wm.shell.taskview.TaskViewController

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -30,13 +30,13 @@ import androidx.test.platform.app.InstrumentationRegistry.getInstrumentation
		import com.android.internal.protolog.ProtoLog
		import com.android.wm.shell.R
		import com.android.wm.shell.bubbles.BubblePositioner
		import com.android.wm.shell.bubbles.DeviceConfig
		import com.android.wm.shell.shared.bubbles.BaseBubblePinController
		import com.android.wm.shell.shared.bubbles.BaseBubblePinController.Companion.DROP_TARGET_ALPHA_IN_DURATION
		import com.android.wm.shell.shared.bubbles.BaseBubblePinController.Companion.DROP_TARGET_ALPHA_OUT_DURATION
		import com.android.wm.shell.shared.bubbles.BubbleBarLocation
		import com.android.wm.shell.shared.bubbles.BubbleBarLocation.LEFT
		import com.android.wm.shell.shared.bubbles.BubbleBarLocation.RIGHT
		import com.android.wm.shell.shared.bubbles.DeviceConfig
		import com.google.common.truth.Truth.assertThat
		import org.junit.After
		import org.junit.Before