Merge changes from topic "windowPrototype" into main

* changes:
  Fixing tests related to abstraction
  Abstracting StatefulActivity from StateManager
This commit is contained in:
Randy Pfohl
2024-06-13 22:11:49 +00:00
committed by Android (Google) Code Review
25 changed files with 164 additions and 83 deletions

View File

@@ -78,7 +78,7 @@ class SplitAnimationControllerTest {
private val mockSplitSourceDrawable: Drawable = mock()
private val mockSplitSourceView: View = mock()
private val stateManager: StateManager<*> = mock()
private val stateManager: StateManager<*, *> = mock()
private val depthController: DepthController = mock()
private val transitionInfo: TransitionInfo = mock()
private val transaction: Transaction = mock()

View File

@@ -31,6 +31,7 @@ import com.android.launcher3.logging.StatsLogManager.StatsLogger
import com.android.launcher3.model.data.ItemInfo
import com.android.launcher3.statehandlers.DepthController
import com.android.launcher3.statemanager.StateManager
import com.android.launcher3.statemanager.StatefulActivity
import com.android.launcher3.util.ComponentKey
import com.android.launcher3.util.SplitConfigurationOptions
import com.android.quickstep.RecentsModel
@@ -61,7 +62,7 @@ class SplitSelectStateControllerTest {
private val depthController: DepthController = mock()
private val statsLogManager: StatsLogManager = mock()
private val statsLogger: StatsLogger = mock()
private val stateManager: StateManager<LauncherState> = mock()
private val stateManager: StateManager<LauncherState, StatefulActivity<LauncherState>> = mock()
private val handler: Handler = mock()
private val context: RecentsViewContainer = mock()
private val recentsModel: RecentsModel = mock()