aa8ef119f1
> Changing dragObject to ItemInfo > Removing dropPos which is always null > Removing requiresDbUpdate which is only used in CellLayout Change-Id: I753ddaae0880c8a9bfee5a1266095ff34610284a
435 lines
17 KiB
Java
435 lines
17 KiB
Java
package com.android.launcher3.accessibility;
|
|
|
|
import android.annotation.TargetApi;
|
|
import android.app.AlertDialog;
|
|
import android.appwidget.AppWidgetProviderInfo;
|
|
import android.content.DialogInterface;
|
|
import android.graphics.Rect;
|
|
import android.os.Build;
|
|
import android.os.Bundle;
|
|
import android.os.Handler;
|
|
import android.text.TextUtils;
|
|
import android.util.Log;
|
|
import android.util.SparseArray;
|
|
import android.view.View;
|
|
import android.view.View.AccessibilityDelegate;
|
|
import android.view.accessibility.AccessibilityNodeInfo;
|
|
import android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction;
|
|
|
|
import com.android.launcher3.AppInfo;
|
|
import com.android.launcher3.AppWidgetResizeFrame;
|
|
import com.android.launcher3.CellLayout;
|
|
import com.android.launcher3.DeleteDropTarget;
|
|
import com.android.launcher3.DragController.DragListener;
|
|
import com.android.launcher3.DragSource;
|
|
import com.android.launcher3.Folder;
|
|
import com.android.launcher3.FolderInfo;
|
|
import com.android.launcher3.InfoDropTarget;
|
|
import com.android.launcher3.ItemInfo;
|
|
import com.android.launcher3.Launcher;
|
|
import com.android.launcher3.LauncherAppWidgetHostView;
|
|
import com.android.launcher3.LauncherAppWidgetInfo;
|
|
import com.android.launcher3.LauncherModel;
|
|
import com.android.launcher3.LauncherSettings;
|
|
import com.android.launcher3.PendingAddItemInfo;
|
|
import com.android.launcher3.R;
|
|
import com.android.launcher3.ShortcutInfo;
|
|
import com.android.launcher3.UninstallDropTarget;
|
|
import com.android.launcher3.Workspace;
|
|
import com.android.launcher3.util.Thunk;
|
|
|
|
import java.util.ArrayList;
|
|
|
|
@TargetApi(Build.VERSION_CODES.LOLLIPOP)
|
|
public class LauncherAccessibilityDelegate extends AccessibilityDelegate implements DragListener {
|
|
|
|
private static final String TAG = "LauncherAccessibilityDelegate";
|
|
|
|
private static final int REMOVE = R.id.action_remove;
|
|
private static final int INFO = R.id.action_info;
|
|
private static final int UNINSTALL = R.id.action_uninstall;
|
|
private static final int ADD_TO_WORKSPACE = R.id.action_add_to_workspace;
|
|
private static final int MOVE = R.id.action_move;
|
|
private static final int MOVE_TO_WORKSPACE = R.id.action_move_to_workspace;
|
|
private static final int RESIZE = R.id.action_resize;
|
|
|
|
public enum DragType {
|
|
ICON,
|
|
FOLDER,
|
|
WIDGET
|
|
}
|
|
|
|
public static class DragInfo {
|
|
public DragType dragType;
|
|
public ItemInfo info;
|
|
public View item;
|
|
}
|
|
|
|
private final SparseArray<AccessibilityAction> mActions = new SparseArray<>();
|
|
@Thunk final Launcher mLauncher;
|
|
|
|
private DragInfo mDragInfo = null;
|
|
private AccessibilityDragSource mDragSource = null;
|
|
|
|
public LauncherAccessibilityDelegate(Launcher launcher) {
|
|
mLauncher = launcher;
|
|
|
|
mActions.put(REMOVE, new AccessibilityAction(REMOVE,
|
|
launcher.getText(R.string.delete_target_label)));
|
|
mActions.put(INFO, new AccessibilityAction(INFO,
|
|
launcher.getText(R.string.info_target_label)));
|
|
mActions.put(UNINSTALL, new AccessibilityAction(UNINSTALL,
|
|
launcher.getText(R.string.delete_target_uninstall_label)));
|
|
mActions.put(ADD_TO_WORKSPACE, new AccessibilityAction(ADD_TO_WORKSPACE,
|
|
launcher.getText(R.string.action_add_to_workspace)));
|
|
mActions.put(MOVE, new AccessibilityAction(MOVE,
|
|
launcher.getText(R.string.action_move)));
|
|
mActions.put(MOVE_TO_WORKSPACE, new AccessibilityAction(MOVE_TO_WORKSPACE,
|
|
launcher.getText(R.string.action_move_to_workspace)));
|
|
mActions.put(RESIZE, new AccessibilityAction(RESIZE,
|
|
launcher.getText(R.string.action_resize)));
|
|
}
|
|
|
|
@Override
|
|
public void onInitializeAccessibilityNodeInfo(View host, AccessibilityNodeInfo info) {
|
|
super.onInitializeAccessibilityNodeInfo(host, info);
|
|
if (!(host.getTag() instanceof ItemInfo)) return;
|
|
ItemInfo item = (ItemInfo) host.getTag();
|
|
|
|
if (DeleteDropTarget.supportsDrop(item)) {
|
|
info.addAction(mActions.get(REMOVE));
|
|
}
|
|
if (UninstallDropTarget.supportsDrop(host.getContext(), item)) {
|
|
info.addAction(mActions.get(UNINSTALL));
|
|
}
|
|
if (InfoDropTarget.supportsDrop(host.getContext(), item)) {
|
|
info.addAction(mActions.get(INFO));
|
|
}
|
|
|
|
if ((item instanceof ShortcutInfo)
|
|
|| (item instanceof LauncherAppWidgetInfo)
|
|
|| (item instanceof FolderInfo)) {
|
|
info.addAction(mActions.get(MOVE));
|
|
|
|
if (item.container >= 0) {
|
|
info.addAction(mActions.get(MOVE_TO_WORKSPACE));
|
|
} else if (item instanceof LauncherAppWidgetInfo) {
|
|
if (!getSupportedResizeActions(host, (LauncherAppWidgetInfo) item).isEmpty()) {
|
|
info.addAction(mActions.get(RESIZE));
|
|
}
|
|
}
|
|
} if ((item instanceof AppInfo) || (item instanceof PendingAddItemInfo)) {
|
|
info.addAction(mActions.get(ADD_TO_WORKSPACE));
|
|
}
|
|
}
|
|
|
|
@Override
|
|
public boolean performAccessibilityAction(View host, int action, Bundle args) {
|
|
if ((host.getTag() instanceof ItemInfo)
|
|
&& performAction(host, (ItemInfo) host.getTag(), action)) {
|
|
return true;
|
|
}
|
|
return super.performAccessibilityAction(host, action, args);
|
|
}
|
|
|
|
public boolean performAction(final View host, final ItemInfo item, int action) {
|
|
if (action == REMOVE) {
|
|
if (DeleteDropTarget.removeWorkspaceOrFolderItem(mLauncher, item, host)) {
|
|
announceConfirmation(R.string.item_removed);
|
|
return true;
|
|
}
|
|
return false;
|
|
} else if (action == INFO) {
|
|
InfoDropTarget.startDetailsActivityForInfo(item, mLauncher);
|
|
return true;
|
|
} else if (action == UNINSTALL) {
|
|
return UninstallDropTarget.startUninstallActivity(mLauncher, item);
|
|
} else if (action == MOVE) {
|
|
beginAccessibleDrag(host, item);
|
|
} else if (action == ADD_TO_WORKSPACE) {
|
|
final int[] coordinates = new int[2];
|
|
final long screenId = findSpaceOnWorkspace(item, coordinates);
|
|
mLauncher.showWorkspace(true, new Runnable() {
|
|
|
|
@Override
|
|
public void run() {
|
|
if (item instanceof AppInfo) {
|
|
ShortcutInfo info = ((AppInfo) item).makeShortcut();
|
|
LauncherModel.addItemToDatabase(mLauncher, info,
|
|
LauncherSettings.Favorites.CONTAINER_DESKTOP,
|
|
screenId, coordinates[0], coordinates[1]);
|
|
|
|
ArrayList<ItemInfo> itemList = new ArrayList<>();
|
|
itemList.add(info);
|
|
mLauncher.bindItems(itemList, 0, itemList.size(), true);
|
|
} else if (item instanceof PendingAddItemInfo) {
|
|
PendingAddItemInfo info = (PendingAddItemInfo) item;
|
|
Workspace workspace = mLauncher.getWorkspace();
|
|
workspace.snapToPage(workspace.getPageIndexForScreenId(screenId));
|
|
mLauncher.addPendingItem(info, LauncherSettings.Favorites.CONTAINER_DESKTOP,
|
|
screenId, coordinates, info.spanX, info.spanY);
|
|
}
|
|
announceConfirmation(R.string.item_added_to_workspace);
|
|
}
|
|
});
|
|
return true;
|
|
} else if (action == MOVE_TO_WORKSPACE) {
|
|
Folder folder = mLauncher.getWorkspace().getOpenFolder();
|
|
mLauncher.closeFolder(folder);
|
|
ShortcutInfo info = (ShortcutInfo) item;
|
|
folder.getInfo().remove(info);
|
|
|
|
final int[] coordinates = new int[2];
|
|
final long screenId = findSpaceOnWorkspace(item, coordinates);
|
|
LauncherModel.moveItemInDatabase(mLauncher, info,
|
|
LauncherSettings.Favorites.CONTAINER_DESKTOP,
|
|
screenId, coordinates[0], coordinates[1]);
|
|
|
|
// Bind the item in next frame so that if a new workspace page was created,
|
|
// it will get laid out.
|
|
new Handler().post(new Runnable() {
|
|
|
|
@Override
|
|
public void run() {
|
|
ArrayList<ItemInfo> itemList = new ArrayList<>();
|
|
itemList.add(item);
|
|
mLauncher.bindItems(itemList, 0, itemList.size(), true);
|
|
announceConfirmation(R.string.item_moved);
|
|
}
|
|
});
|
|
} else if (action == RESIZE) {
|
|
final LauncherAppWidgetInfo info = (LauncherAppWidgetInfo) item;
|
|
final ArrayList<Integer> actions = getSupportedResizeActions(host, info);
|
|
CharSequence[] labels = new CharSequence[actions.size()];
|
|
for (int i = 0; i < actions.size(); i++) {
|
|
labels[i] = mLauncher.getText(actions.get(i));
|
|
}
|
|
|
|
new AlertDialog.Builder(mLauncher)
|
|
.setTitle(R.string.action_resize)
|
|
.setItems(labels, new DialogInterface.OnClickListener() {
|
|
|
|
@Override
|
|
public void onClick(DialogInterface dialog, int which) {
|
|
performResizeAction(actions.get(which), host, info);
|
|
dialog.dismiss();
|
|
}
|
|
})
|
|
.show();
|
|
}
|
|
return false;
|
|
}
|
|
|
|
private ArrayList<Integer> getSupportedResizeActions(View host, LauncherAppWidgetInfo info) {
|
|
ArrayList<Integer> actions = new ArrayList<>();
|
|
|
|
AppWidgetProviderInfo providerInfo = ((LauncherAppWidgetHostView) host).getAppWidgetInfo();
|
|
if (providerInfo == null) {
|
|
return actions;
|
|
}
|
|
|
|
CellLayout layout = (CellLayout) host.getParent().getParent();
|
|
if ((providerInfo.resizeMode & AppWidgetProviderInfo.RESIZE_HORIZONTAL) != 0) {
|
|
if (layout.isRegionVacant(info.cellX + info.spanX, info.cellY, 1, info.spanY) ||
|
|
layout.isRegionVacant(info.cellX - 1, info.cellY, 1, info.spanY)) {
|
|
actions.add(R.string.action_increase_width);
|
|
}
|
|
|
|
if (info.spanX > info.minSpanX && info.spanX > 1) {
|
|
actions.add(R.string.action_decrease_width);
|
|
}
|
|
}
|
|
|
|
if ((providerInfo.resizeMode & AppWidgetProviderInfo.RESIZE_VERTICAL) != 0) {
|
|
if (layout.isRegionVacant(info.cellX, info.cellY + info.spanY, info.spanX, 1) ||
|
|
layout.isRegionVacant(info.cellX, info.cellY - 1, info.spanX, 1)) {
|
|
actions.add(R.string.action_increase_height);
|
|
}
|
|
|
|
if (info.spanY > info.minSpanY && info.spanY > 1) {
|
|
actions.add(R.string.action_decrease_height);
|
|
}
|
|
}
|
|
return actions;
|
|
}
|
|
|
|
@Thunk void performResizeAction(int action, View host, LauncherAppWidgetInfo info) {
|
|
CellLayout.LayoutParams lp = (CellLayout.LayoutParams) host.getLayoutParams();
|
|
CellLayout layout = (CellLayout) host.getParent().getParent();
|
|
layout.markCellsAsUnoccupiedForView(host);
|
|
|
|
if (action == R.string.action_increase_width) {
|
|
if (((host.getLayoutDirection() == View.LAYOUT_DIRECTION_RTL)
|
|
&& layout.isRegionVacant(info.cellX - 1, info.cellY, 1, info.spanY))
|
|
|| !layout.isRegionVacant(info.cellX + info.spanX, info.cellY, 1, info.spanY)) {
|
|
lp.cellX --;
|
|
info.cellX --;
|
|
}
|
|
lp.cellHSpan ++;
|
|
info.spanX ++;
|
|
} else if (action == R.string.action_decrease_width) {
|
|
lp.cellHSpan --;
|
|
info.spanX --;
|
|
} else if (action == R.string.action_increase_height) {
|
|
if (!layout.isRegionVacant(info.cellX, info.cellY + info.spanY, info.spanX, 1)) {
|
|
lp.cellY --;
|
|
info.cellY --;
|
|
}
|
|
lp.cellVSpan ++;
|
|
info.spanY ++;
|
|
} else if (action == R.string.action_decrease_height) {
|
|
lp.cellVSpan --;
|
|
info.spanY --;
|
|
}
|
|
|
|
layout.markCellsAsOccupiedForView(host);
|
|
Rect sizeRange = new Rect();
|
|
AppWidgetResizeFrame.getWidgetSizeRanges(mLauncher, info.spanX, info.spanY, sizeRange);
|
|
((LauncherAppWidgetHostView) host).updateAppWidgetSize(null,
|
|
sizeRange.left, sizeRange.top, sizeRange.right, sizeRange.bottom);
|
|
host.requestLayout();
|
|
LauncherModel.updateItemInDatabase(mLauncher, info);
|
|
announceConfirmation(mLauncher.getString(R.string.widget_resized, info.spanX, info.spanY));
|
|
}
|
|
|
|
@Thunk void announceConfirmation(int resId) {
|
|
announceConfirmation(mLauncher.getResources().getString(resId));
|
|
}
|
|
|
|
@Thunk void announceConfirmation(String confirmation) {
|
|
mLauncher.getDragLayer().announceForAccessibility(confirmation);
|
|
|
|
}
|
|
|
|
public boolean isInAccessibleDrag() {
|
|
return mDragInfo != null;
|
|
}
|
|
|
|
public DragInfo getDragInfo() {
|
|
return mDragInfo;
|
|
}
|
|
|
|
/**
|
|
* @param clickedTarget the actual view that was clicked
|
|
* @param dropLocation relative to {@param clickedTarget}. If provided, its center is used
|
|
* as the actual drop location otherwise the views center is used.
|
|
*/
|
|
public void handleAccessibleDrop(View clickedTarget, Rect dropLocation,
|
|
String confirmation) {
|
|
if (!isInAccessibleDrag()) return;
|
|
|
|
int[] loc = new int[2];
|
|
if (dropLocation == null) {
|
|
loc[0] = clickedTarget.getWidth() / 2;
|
|
loc[1] = clickedTarget.getHeight() / 2;
|
|
} else {
|
|
loc[0] = dropLocation.centerX();
|
|
loc[1] = dropLocation.centerY();
|
|
}
|
|
|
|
mLauncher.getDragLayer().getDescendantCoordRelativeToSelf(clickedTarget, loc);
|
|
mLauncher.getDragController().completeAccessibleDrag(loc);
|
|
|
|
if (!TextUtils.isEmpty(confirmation)) {
|
|
announceConfirmation(confirmation);
|
|
}
|
|
}
|
|
|
|
public void beginAccessibleDrag(View item, ItemInfo info) {
|
|
mDragInfo = new DragInfo();
|
|
mDragInfo.info = info;
|
|
mDragInfo.item = item;
|
|
mDragInfo.dragType = DragType.ICON;
|
|
if (info instanceof FolderInfo) {
|
|
mDragInfo.dragType = DragType.FOLDER;
|
|
} else if (info instanceof LauncherAppWidgetInfo) {
|
|
mDragInfo.dragType = DragType.WIDGET;
|
|
}
|
|
|
|
CellLayout.CellInfo cellInfo = new CellLayout.CellInfo(item, info);
|
|
|
|
Rect pos = new Rect();
|
|
mLauncher.getDragLayer().getDescendantRectRelativeToSelf(item, pos);
|
|
mLauncher.getDragController().prepareAccessibleDrag(pos.centerX(), pos.centerY());
|
|
|
|
Workspace workspace = mLauncher.getWorkspace();
|
|
|
|
Folder folder = workspace.getOpenFolder();
|
|
if (folder != null) {
|
|
if (folder.getItemsInReadingOrder().contains(item)) {
|
|
mDragSource = folder;
|
|
} else {
|
|
mLauncher.closeFolder();
|
|
}
|
|
}
|
|
if (mDragSource == null) {
|
|
mDragSource = workspace;
|
|
}
|
|
mDragSource.enableAccessibleDrag(true);
|
|
mDragSource.startDrag(cellInfo, true);
|
|
|
|
if (mLauncher.getDragController().isDragging()) {
|
|
mLauncher.getDragController().addDragListener(this);
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
public void onDragStart(DragSource source, ItemInfo info, int dragAction) {
|
|
// No-op
|
|
}
|
|
|
|
@Override
|
|
public void onDragEnd() {
|
|
mLauncher.getDragController().removeDragListener(this);
|
|
mDragInfo = null;
|
|
if (mDragSource != null) {
|
|
mDragSource.enableAccessibleDrag(false);
|
|
mDragSource = null;
|
|
}
|
|
}
|
|
|
|
public static interface AccessibilityDragSource {
|
|
void startDrag(CellLayout.CellInfo cellInfo, boolean accessible);
|
|
|
|
void enableAccessibleDrag(boolean enable);
|
|
}
|
|
|
|
/**
|
|
* Find empty space on the workspace and returns the screenId.
|
|
*/
|
|
private long findSpaceOnWorkspace(ItemInfo info, int[] outCoordinates) {
|
|
Workspace workspace = mLauncher.getWorkspace();
|
|
ArrayList<Long> workspaceScreens = workspace.getScreenOrder();
|
|
long screenId;
|
|
|
|
// First check if there is space on the current screen.
|
|
int screenIndex = workspace.getCurrentPage();
|
|
screenId = workspaceScreens.get(screenIndex);
|
|
CellLayout layout = (CellLayout) workspace.getPageAt(screenIndex);
|
|
|
|
boolean found = layout.findCellForSpan(outCoordinates, info.spanX, info.spanY);
|
|
screenIndex = workspace.hasCustomContent() ? 1 : 0;
|
|
while (!found && screenIndex < workspaceScreens.size()) {
|
|
screenId = workspaceScreens.get(screenIndex);
|
|
layout = (CellLayout) workspace.getPageAt(screenIndex);
|
|
found = layout.findCellForSpan(outCoordinates, info.spanX, info.spanY);
|
|
screenIndex++;
|
|
}
|
|
|
|
if (found) {
|
|
return screenId;
|
|
}
|
|
|
|
workspace.addExtraEmptyScreen();
|
|
screenId = workspace.commitExtraEmptyScreen();
|
|
layout = workspace.getScreenWithId(screenId);
|
|
found = layout.findCellForSpan(outCoordinates, info.spanX, info.spanY);
|
|
|
|
if (!found) {
|
|
Log.wtf(TAG, "Not enough space on an empty screen");
|
|
}
|
|
return screenId;
|
|
}
|
|
}
|