aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-27 23:36:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Use mock TaskStackChangeListeners in RecentsModelTest" into main

Browse Source
This commit is contained in:
Alex Chau
2023-10-09 16:39:13 +00:00
committed by Android (Google) Code Review
parent b95ee09a69 a0c149fc8d
commit 461b65fa4e
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
quickstep/src/com/android/quickstep/RecentsModel.java
View File

@@ -78,6 +78,8 @@ public class RecentsModel implements IconChangeListener, TaskStackChangeListener
private final TaskThumbnailCache mThumbnailCache;
private final ComponentCallbacks mCallbacks;
private final TaskStackChangeListeners mTaskStackChangeListeners;
private RecentsModel(Context context) {
this(context, new IconProvider(context));
}
@@ -89,13 +91,14 @@ public class RecentsModel implements IconChangeListener, TaskStackChangeListener
SystemUiProxy.INSTANCE.get(context)),
new TaskIconCache(context, RECENTS_MODEL_EXECUTOR, iconProvider),
new TaskThumbnailCache(context, RECENTS_MODEL_EXECUTOR),
iconProvider);
iconProvider,
TaskStackChangeListeners.getInstance());
}
@VisibleForTesting
RecentsModel(Context context, RecentTasksList taskList, TaskIconCache iconCache,
TaskThumbnailCache thumbnailCache,
IconProvider iconProvider) {
TaskThumbnailCache thumbnailCache, IconProvider iconProvider,
TaskStackChangeListeners taskStackChangeListeners) {
mContext = context;
mTaskList = taskList;
mIconCache = iconCache;
@@ -117,7 +120,8 @@ public class RecentsModel implements IconChangeListener, TaskStackChangeListener
mCallbacks = null;
}
TaskStackChangeListeners.getInstance().registerTaskStackListener(this);
mTaskStackChangeListeners = taskStackChangeListeners;
mTaskStackChangeListeners.registerTaskStackListener(this);
iconProvider.registerIconChangeListener(this, MAIN_EXECUTOR.getHandler());
}
@@ -358,6 +362,8 @@ public class RecentsModel implements IconChangeListener, TaskStackChangeListener
if (mCallbacks != null) {
mContext.unregisterComponentCallbacks(mCallbacks);
}
mIconCache.removeTaskVisualsChangeListener();
mTaskStackChangeListeners.unregisterTaskStackListener(this);
}
/**

3
quickstep/tests/src/com/android/quickstep/RecentsModelTest.java
View File

@@ -42,6 +42,7 @@ import com.android.launcher3.R;
import com.android.launcher3.icons.IconProvider;
import com.android.quickstep.util.GroupTask;
import com.android.systemui.shared.recents.model.Task;
import com.android.systemui.shared.system.TaskStackChangeListeners;
import org.junit.After;
import org.junit.Before;
@@ -93,7 +94,7 @@ public class RecentsModelTest {
when(mThumbnailCache.isPreloadingEnabled()).thenReturn(true);
mRecentsModel = new RecentsModel(mContext, mTasksList, mock(TaskIconCache.class),
mThumbnailCache, mock(IconProvider.class));
mThumbnailCache, mock(IconProvider.class), mock(TaskStackChangeListeners.class));
mResource = mock(Resources.class);
when(mResource.getInteger((R.integer.recentsThumbnailCacheSize))).thenReturn(3);