aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-03-04 18:06:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Moving various launcher binding logic, outside LauncherModel" into main

Browse Source
This commit is contained in:
Treehugger Robot
2025-04-23 12:32:54 -07:00
committed by Android (Google) Code Review
parent ab4794a638 c078d6554c
commit 59e208c28e
16 changed files with 401 additions and 576 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarOverflowTest.kt
View File

@@ -32,6 +32,8 @@ import com.android.launcher3.R
import com.android.launcher3.dagger.LauncherAppSingleton
import com.android.launcher3.dagger.LauncherComponentProvider.appComponent
import com.android.launcher3.model.BgDataModel
import com.android.launcher3.model.BgDataModel.FixedContainerItems
import com.android.launcher3.model.StringCache
import com.android.launcher3.model.data.ItemInfo
import com.android.launcher3.model.data.TaskItemInfo
import com.android.launcher3.model.data.WorkspaceItemInfo
@@ -56,6 +58,7 @@ import com.android.launcher3.taskbar.rules.TaskbarUnitTestRule.InjectController
import com.android.launcher3.taskbar.rules.TaskbarWindowSandboxContext
import com.android.launcher3.util.AllModulesForTest
import com.android.launcher3.util.FakePrefsModule
import com.android.launcher3.util.IntSparseArrayMap
import com.android.launcher3.util.LauncherMultivalentJUnit
import com.android.launcher3.util.LauncherMultivalentJUnit.EmulatedDevices
import com.android.launcher3.util.Preconditions.assertNotNull
@@ -571,7 +574,7 @@ class TaskbarOverflowTest {
taskbarView.updateItems(hotseatItems, recentAppsController.shownTasks)
modelCallback.recentAppsController = recentAppsController
context.baseContext.appComponent.launcherAppState.model.addCallbacksAndLoad(modelCallback)
modelCallback.bindItems(hotseatItems.toList(), false)
modelCallback.bindItemsAdded(hotseatItems.toList())
return taskbarView
}
@@ -694,9 +697,16 @@ class TaskbarOverflowTest {
var hotseatItems = mutableListOf<WorkspaceItemInfo>()
var recentAppsController: TaskbarRecentAppsController? = null
override fun bindItems(shortcuts: List<ItemInfo>, forceAnimateIcons: Boolean) {
override fun bindCompleteModel(
itemIdMap: IntSparseArrayMap<ItemInfo>,
extraItems: MutableList<FixedContainerItems>,
stringCache: StringCache,
isBindingSync: Boolean,
) = bindItemsAdded(itemIdMap.toList())
override fun bindItemsAdded(items: List<ItemInfo>) {
runOnMainSync {
shortcuts
items
.filter { item ->
item is WorkspaceItemInfo &&
!hotseatItems.any { it.targetPackage == item.targetPackage }