-> Using the context menu, and a new two stage system, this allows users to curate icons and widgets on the workspace -> Move icons / widgets to any empty cell on any existing screen, or create a new screen (appended to the right, as with regular drag and drop) -> Move icons into existing folders -> Create folders by moving an icon onto another icon -> Also added confirmations for these and some existing accessibility actions Limitations: -> Currently, no support for drag and drop in folders -> Considering moving the drag view so it doesn't occlude any content (in particular, when user changes pages) -> In this mode, accessibility framework seems to have problems with the next / prev operations Bug: 18482913 Change-Id: I19b0be9dc8bfa766d430408c8ad9303c716b89b2
213 lines
7.7 KiB
Java
213 lines
7.7 KiB
Java
package com.android.launcher3;
|
|
|
|
import android.annotation.TargetApi;
|
|
import android.content.res.Resources;
|
|
import android.graphics.Rect;
|
|
import android.os.Build;
|
|
import android.os.Bundle;
|
|
import android.support.v4.view.accessibility.AccessibilityEventCompat;
|
|
import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat;
|
|
import android.util.SparseArray;
|
|
import android.view.View;
|
|
import android.view.View.AccessibilityDelegate;
|
|
import android.view.accessibility.AccessibilityEvent;
|
|
import android.view.accessibility.AccessibilityNodeInfo;
|
|
import android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction;
|
|
|
|
import com.android.launcher3.LauncherModel.ScreenPosProvider;
|
|
|
|
import java.util.ArrayList;
|
|
|
|
@TargetApi(Build.VERSION_CODES.LOLLIPOP)
|
|
public class LauncherAccessibilityDelegate extends AccessibilityDelegate {
|
|
|
|
public static final int REMOVE = R.id.action_remove;
|
|
public static final int INFO = R.id.action_info;
|
|
public static final int UNINSTALL = R.id.action_uninstall;
|
|
public static final int ADD_TO_WORKSPACE = R.id.action_add_to_workspace;
|
|
public static final int MOVE = R.id.action_move;
|
|
|
|
enum DragType {
|
|
ICON,
|
|
FOLDER,
|
|
WIDGET
|
|
}
|
|
|
|
public static class DragInfo {
|
|
DragType dragType;
|
|
ItemInfo info;
|
|
View item;
|
|
}
|
|
|
|
private DragInfo mDragInfo = null;
|
|
|
|
private final SparseArray<AccessibilityAction> mActions =
|
|
new SparseArray<AccessibilityAction>();
|
|
private final Launcher mLauncher;
|
|
|
|
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)));
|
|
|
|
}
|
|
|
|
@Override
|
|
public void onInitializeAccessibilityNodeInfo(View host, AccessibilityNodeInfo info) {
|
|
super.onInitializeAccessibilityNodeInfo(host, info);
|
|
if (!(host.getTag() instanceof ItemInfo)) return;
|
|
ItemInfo item = (ItemInfo) host.getTag();
|
|
|
|
if ((item instanceof ShortcutInfo)
|
|
|| (item instanceof LauncherAppWidgetInfo)
|
|
|| (item instanceof FolderInfo)) {
|
|
// Workspace shortcut / widget
|
|
info.addAction(mActions.get(REMOVE));
|
|
info.addAction(mActions.get(MOVE));
|
|
} else if ((item instanceof AppInfo) || (item instanceof PendingAddItemInfo)) {
|
|
// App or Widget from customization tray
|
|
if (item instanceof AppInfo) {
|
|
info.addAction(mActions.get(UNINSTALL));
|
|
}
|
|
info.addAction(mActions.get(INFO));
|
|
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(View host, ItemInfo item, int action) {
|
|
Resources res = mLauncher.getResources();
|
|
if (action == REMOVE) {
|
|
if (DeleteDropTarget.removeWorkspaceOrFolderItem(mLauncher, item, host)) {
|
|
announceConfirmation(R.string.item_removed_from_workspace);
|
|
return true;
|
|
}
|
|
return false;
|
|
} else if (action == INFO) {
|
|
InfoDropTarget.startDetailsActivityForInfo(item, mLauncher);
|
|
return true;
|
|
} else if (action == UNINSTALL) {
|
|
DeleteDropTarget.uninstallApp(mLauncher, (AppInfo) item);
|
|
return true;
|
|
} else if (action == MOVE) {
|
|
beginAccessibleDrag(host, item);
|
|
} else if (action == ADD_TO_WORKSPACE) {
|
|
final int preferredPage = mLauncher.getWorkspace().getCurrentPage();
|
|
final ScreenPosProvider screenProvider = new ScreenPosProvider() {
|
|
|
|
@Override
|
|
public int getScreenIndex(ArrayList<Long> screenIDs) {
|
|
return preferredPage;
|
|
}
|
|
};
|
|
if (item instanceof AppInfo) {
|
|
final ArrayList<ItemInfo> addShortcuts = new ArrayList<ItemInfo>();
|
|
addShortcuts.add(((AppInfo) item).makeShortcut());
|
|
mLauncher.showWorkspace(true, new Runnable() {
|
|
@Override
|
|
public void run() {
|
|
mLauncher.getModel().addAndBindAddedWorkspaceApps(
|
|
mLauncher, addShortcuts, screenProvider, 0, true);
|
|
announceConfirmation(R.string.item_added_to_workspace);
|
|
}
|
|
});
|
|
return true;
|
|
} else if (item instanceof PendingAddItemInfo) {
|
|
mLauncher.getModel().addAndBindPendingItem(
|
|
mLauncher, (PendingAddItemInfo) item, screenProvider, 0);
|
|
announceConfirmation(R.string.item_added_to_workspace);
|
|
return true;
|
|
}
|
|
}
|
|
return false;
|
|
}
|
|
|
|
private void announceConfirmation(int resId) {
|
|
announceConfirmation(mLauncher.getResources().getString(resId));
|
|
}
|
|
|
|
private void announceConfirmation(String confirmation) {
|
|
mLauncher.getDragLayer().announceForAccessibility(confirmation);
|
|
|
|
}
|
|
|
|
public boolean isInAccessibleDrag() {
|
|
return mDragInfo != null;
|
|
}
|
|
|
|
public DragInfo getDragInfo() {
|
|
return mDragInfo;
|
|
}
|
|
|
|
public void handleAccessibleDrop(CellLayout targetContainer, Rect dropLocation,
|
|
String confirmation) {
|
|
if (!isInAccessibleDrag()) return;
|
|
|
|
int[] loc = new int[2];
|
|
loc[0] = dropLocation.centerX();
|
|
loc[1] = dropLocation.centerY();
|
|
|
|
mLauncher.getDragLayer().getDescendantCoordRelativeToSelf(targetContainer, loc);
|
|
mLauncher.getDragController().completeAccessibleDrag(loc);
|
|
|
|
endAccessibleDrag();
|
|
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());
|
|
mLauncher.getWorkspace().enableAccessibleDrag(true);
|
|
mLauncher.getWorkspace().startDrag(cellInfo, true);
|
|
}
|
|
|
|
public boolean onBackPressed() {
|
|
if (isInAccessibleDrag()) {
|
|
cancelAccessibleDrag();
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
private void cancelAccessibleDrag() {
|
|
mLauncher.getDragController().cancelDrag();
|
|
endAccessibleDrag();
|
|
}
|
|
|
|
private void endAccessibleDrag() {
|
|
mDragInfo = null;
|
|
mLauncher.getWorkspace().enableAccessibleDrag(false);
|
|
}
|
|
}
|