Merge "Support Accessibility workspace addition for WorkspaceItemInfo" into sc-v2-dev am: 964c7641ad

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15868593

Change-Id: I9501412ebd52d98e081934fe09e3fb33a6ed5090
This commit is contained in:
Samuel Fufa
2021-09-20 22:06:19 +00:00
committed by Automerger Merge Worker
2 changed files with 10 additions and 2 deletions
@@ -162,7 +162,8 @@ public class LauncherAccessibilityDelegate extends AccessibilityDelegate impleme
}
}
if ((item instanceof AppInfo) || (item instanceof PendingAddItemInfo)) {
if ((item instanceof AppInfo) || (item instanceof WorkspaceItemInfo)
|| (item instanceof PendingAddItemInfo)) {
out.add(mActions.get(ADD_TO_WORKSPACE));
}
}
@@ -244,6 +245,13 @@ public class LauncherAccessibilityDelegate extends AccessibilityDelegate impleme
mLauncher.addPendingItem(info, Favorites.CONTAINER_DESKTOP,
screenId, coordinates, info.spanX, info.spanY);
}
else if (item instanceof WorkspaceItemInfo) {
WorkspaceItemInfo info = ((WorkspaceItemInfo) item).clone();
mLauncher.getModelWriter().addItemToDatabase(info,
Favorites.CONTAINER_DESKTOP,
screenId, coordinates[0], coordinates[1]);
mLauncher.bindItems(Collections.singletonList(info), true, true);
}
}));
return true;
} else if (action == MOVE_TO_WORKSPACE) {
@@ -204,7 +204,7 @@ public class WorkspaceItemInfo extends ItemInfoWithIcon {
}
@Override
public ItemInfoWithIcon clone() {
public WorkspaceItemInfo clone() {
return new WorkspaceItemInfo(this);
}
}