mirror of
https://github.com/LawnchairLauncher/lawnchair.git
synced 2026-02-20 11:18:21 +00:00
This reverts commit 7a4a30d86d.
Test: Presubmit
Reason for revert: Fixing original bug
Bug: 196825541
Change-Id: Id4b1eb24a89564d264266d305aebea52917dfcd9
222 lines
8.4 KiB
Java
222 lines
8.4 KiB
Java
package com.android.launcher3.model;
|
|
|
|
import static org.junit.Assert.assertEquals;
|
|
import static org.junit.Assert.assertFalse;
|
|
import static org.junit.Assert.assertTrue;
|
|
import static org.mockito.Mockito.any;
|
|
import static org.mockito.Mockito.mock;
|
|
import static org.mockito.Mockito.verify;
|
|
|
|
import android.content.ComponentName;
|
|
import android.content.Context;
|
|
import android.content.Intent;
|
|
import android.graphics.Rect;
|
|
import android.util.Pair;
|
|
|
|
import androidx.test.ext.junit.runners.AndroidJUnit4;
|
|
import androidx.test.filters.SmallTest;
|
|
|
|
import com.android.launcher3.InvariantDeviceProfile;
|
|
import com.android.launcher3.LauncherAppState;
|
|
import com.android.launcher3.LauncherSettings;
|
|
import com.android.launcher3.LauncherSettings.Favorites;
|
|
import com.android.launcher3.model.BgDataModel.Callbacks;
|
|
import com.android.launcher3.model.data.ItemInfo;
|
|
import com.android.launcher3.model.data.WorkspaceItemInfo;
|
|
import com.android.launcher3.util.ContentWriter;
|
|
import com.android.launcher3.util.Executors;
|
|
import com.android.launcher3.util.GridOccupancy;
|
|
import com.android.launcher3.util.IntArray;
|
|
import com.android.launcher3.util.IntSparseArrayMap;
|
|
import com.android.launcher3.util.LauncherModelHelper;
|
|
|
|
import org.junit.After;
|
|
import org.junit.Before;
|
|
import org.junit.Test;
|
|
import org.junit.runner.RunWith;
|
|
import org.mockito.ArgumentCaptor;
|
|
|
|
import java.util.ArrayList;
|
|
import java.util.List;
|
|
|
|
/**
|
|
* Tests for {@link AddWorkspaceItemsTask}
|
|
*/
|
|
@SmallTest
|
|
@RunWith(AndroidJUnit4.class)
|
|
public class AddWorkspaceItemsTaskTest {
|
|
|
|
private final ComponentName mComponent1 = new ComponentName("a", "b");
|
|
private final ComponentName mComponent2 = new ComponentName("b", "b");
|
|
|
|
private Context mTargetContext;
|
|
private InvariantDeviceProfile mIdp;
|
|
private LauncherAppState mAppState;
|
|
private LauncherModelHelper mModelHelper;
|
|
|
|
private IntArray mExistingScreens;
|
|
private IntArray mNewScreens;
|
|
private IntSparseArrayMap<GridOccupancy> mScreenOccupancy;
|
|
|
|
@Before
|
|
public void setup() {
|
|
mModelHelper = new LauncherModelHelper();
|
|
mTargetContext = mModelHelper.sandboxContext;
|
|
mIdp = InvariantDeviceProfile.INSTANCE.get(mTargetContext);
|
|
mIdp.numColumns = mIdp.numRows = 5;
|
|
mAppState = LauncherAppState.getInstance(mTargetContext);
|
|
|
|
mExistingScreens = new IntArray();
|
|
mScreenOccupancy = new IntSparseArrayMap<>();
|
|
mNewScreens = new IntArray();
|
|
}
|
|
|
|
@After
|
|
public void tearDown() {
|
|
mModelHelper.destroy();
|
|
}
|
|
|
|
private AddWorkspaceItemsTask newTask(ItemInfo... items) {
|
|
List<Pair<ItemInfo, Object>> list = new ArrayList<>();
|
|
for (ItemInfo item : items) {
|
|
list.add(Pair.create(item, null));
|
|
}
|
|
return new AddWorkspaceItemsTask(list);
|
|
}
|
|
|
|
@Test
|
|
public void testFindSpaceForItem_prefers_second() throws Exception {
|
|
mIdp.isSplitDisplay = false;
|
|
|
|
// First screen has only one hole of size 1
|
|
int nextId = setupWorkspaceWithHoles(1, 1, new Rect(2, 2, 3, 3));
|
|
|
|
// Second screen has 2 holes of sizes 3x2 and 2x3
|
|
setupWorkspaceWithHoles(nextId, 2, new Rect(2, 0, 5, 2), new Rect(0, 2, 2, 5));
|
|
|
|
int[] spaceFound = newTask().findSpaceForItem(
|
|
mAppState, mModelHelper.getBgDataModel(), mExistingScreens, mNewScreens, 1, 1);
|
|
assertEquals(1, spaceFound[0]);
|
|
assertTrue(mScreenOccupancy.get(spaceFound[0])
|
|
.isRegionVacant(spaceFound[1], spaceFound[2], 1, 1));
|
|
|
|
// Find a larger space
|
|
spaceFound = newTask().findSpaceForItem(
|
|
mAppState, mModelHelper.getBgDataModel(), mExistingScreens, mNewScreens, 2, 3);
|
|
assertEquals(2, spaceFound[0]);
|
|
assertTrue(mScreenOccupancy.get(spaceFound[0])
|
|
.isRegionVacant(spaceFound[1], spaceFound[2], 2, 3));
|
|
}
|
|
|
|
@Test
|
|
public void testFindSpaceForItem_prefers_third_on_split_display() throws Exception {
|
|
mIdp.isSplitDisplay = true;
|
|
// First screen has only one hole of size 1
|
|
int nextId = setupWorkspaceWithHoles(1, 1, new Rect(2, 2, 3, 3));
|
|
|
|
// Second screen has 2 holes of sizes 3x2 and 2x3
|
|
setupWorkspaceWithHoles(nextId, 2, new Rect(2, 0, 5, 2), new Rect(0, 2, 2, 5));
|
|
|
|
int[] spaceFound = newTask().findSpaceForItem(
|
|
mAppState, mModelHelper.getBgDataModel(), mExistingScreens, mNewScreens, 1, 1);
|
|
// For split display, it picks the next screen, even if there is enough space
|
|
// on previous screen
|
|
assertEquals(2, spaceFound[0]);
|
|
assertTrue(mScreenOccupancy.get(spaceFound[0])
|
|
.isRegionVacant(spaceFound[1], spaceFound[2], 1, 1));
|
|
}
|
|
|
|
@Test
|
|
public void testFindSpaceForItem_adds_new_screen() throws Exception {
|
|
// First screen has 2 holes of sizes 3x2 and 2x3
|
|
setupWorkspaceWithHoles(1, 1, new Rect(2, 0, 5, 2), new Rect(0, 2, 2, 5));
|
|
|
|
IntArray oldScreens = mExistingScreens.clone();
|
|
int[] spaceFound = newTask().findSpaceForItem(
|
|
mAppState, mModelHelper.getBgDataModel(), mExistingScreens, mNewScreens, 3, 3);
|
|
assertFalse(oldScreens.contains(spaceFound[0]));
|
|
assertTrue(mNewScreens.contains(spaceFound[0]));
|
|
}
|
|
|
|
@Test
|
|
public void testAddItem_existing_item_ignored() throws Exception {
|
|
WorkspaceItemInfo info = new WorkspaceItemInfo();
|
|
info.intent = new Intent().setComponent(mComponent1);
|
|
|
|
// Setup a screen with a hole
|
|
setupWorkspaceWithHoles(1, 1, new Rect(2, 2, 3, 3));
|
|
|
|
// Nothing was added
|
|
assertTrue(mModelHelper.executeTaskForTest(newTask(info)).isEmpty());
|
|
}
|
|
|
|
@Test
|
|
public void testAddItem_some_items_added() throws Exception {
|
|
Callbacks callbacks = mock(Callbacks.class);
|
|
Executors.MAIN_EXECUTOR.submit(() -> mModelHelper.getModel().addCallbacks(callbacks)).get();
|
|
|
|
WorkspaceItemInfo info = new WorkspaceItemInfo();
|
|
info.intent = new Intent().setComponent(mComponent1);
|
|
|
|
WorkspaceItemInfo info2 = new WorkspaceItemInfo();
|
|
info2.intent = new Intent().setComponent(mComponent2);
|
|
|
|
// Setup a screen with a hole
|
|
setupWorkspaceWithHoles(1, 1, new Rect(2, 2, 3, 3));
|
|
|
|
mModelHelper.executeTaskForTest(newTask(info, info2)).get(0).run();
|
|
ArgumentCaptor<ArrayList> notAnimated = ArgumentCaptor.forClass(ArrayList.class);
|
|
ArgumentCaptor<ArrayList> animated = ArgumentCaptor.forClass(ArrayList.class);
|
|
|
|
// only info2 should be added because info was already added to the workspace
|
|
// in setupWorkspaceWithHoles()
|
|
verify(callbacks).bindAppsAdded(any(IntArray.class), notAnimated.capture(),
|
|
animated.capture());
|
|
assertTrue(notAnimated.getValue().isEmpty());
|
|
|
|
assertEquals(1, animated.getValue().size());
|
|
assertTrue(animated.getValue().contains(info2));
|
|
}
|
|
|
|
private int setupWorkspaceWithHoles(int startId, int screenId, Rect... holes) throws Exception {
|
|
return mModelHelper.executeSimpleTask(
|
|
model -> writeWorkspaceWithHoles(model, startId, screenId, holes));
|
|
}
|
|
|
|
private int writeWorkspaceWithHoles(
|
|
BgDataModel bgDataModel, int startId, int screenId, Rect... holes) {
|
|
GridOccupancy occupancy = new GridOccupancy(mIdp.numColumns, mIdp.numRows);
|
|
occupancy.markCells(0, 0, mIdp.numColumns, mIdp.numRows, true);
|
|
for (Rect r : holes) {
|
|
occupancy.markCells(r, false);
|
|
}
|
|
|
|
mExistingScreens.add(screenId);
|
|
mScreenOccupancy.append(screenId, occupancy);
|
|
|
|
for (int x = 0; x < mIdp.numColumns; x++) {
|
|
for (int y = 0; y < mIdp.numRows; y++) {
|
|
if (!occupancy.cells[x][y]) {
|
|
continue;
|
|
}
|
|
|
|
WorkspaceItemInfo info = new WorkspaceItemInfo();
|
|
info.intent = new Intent().setComponent(mComponent1);
|
|
info.id = startId++;
|
|
info.screenId = screenId;
|
|
info.cellX = x;
|
|
info.cellY = y;
|
|
info.container = LauncherSettings.Favorites.CONTAINER_DESKTOP;
|
|
bgDataModel.addItem(mTargetContext, info, false);
|
|
|
|
ContentWriter writer = new ContentWriter(mTargetContext);
|
|
info.writeToValues(writer);
|
|
writer.put(Favorites._ID, info.id);
|
|
mTargetContext.getContentResolver().insert(Favorites.CONTENT_URI,
|
|
writer.getValues(mTargetContext));
|
|
}
|
|
}
|
|
return startId;
|
|
}
|
|
}
|