Added custom actions for showing the shortcuts menu and adding a quick action
on the home screen
Bug: 30374655
Change-Id: I2f3ae31f2fb2c09f64f2a47e95a9d25435f7efe2
diff --git a/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java b/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java
index 6bf8abf..0562cf5 100644
--- a/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java
+++ b/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java
@@ -18,6 +18,7 @@
import com.android.launcher3.AppInfo;
import com.android.launcher3.AppWidgetResizeFrame;
+import com.android.launcher3.BubbleTextView;
import com.android.launcher3.CellLayout;
import com.android.launcher3.DeleteDropTarget;
import com.android.launcher3.DragSource;
@@ -36,6 +37,8 @@
import com.android.launcher3.UninstallDropTarget;
import com.android.launcher3.Workspace;
import com.android.launcher3.dragndrop.DragController.DragListener;
+import com.android.launcher3.shortcuts.DeepShortcutTextView;
+import com.android.launcher3.shortcuts.DeepShortcutsContainer;
import com.android.launcher3.util.Thunk;
import java.util.ArrayList;
@@ -45,13 +48,14 @@
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;
+ protected static final int REMOVE = R.id.action_remove;
+ protected static final int INFO = R.id.action_info;
+ protected static final int UNINSTALL = R.id.action_uninstall;
+ protected static final int ADD_TO_WORKSPACE = R.id.action_add_to_workspace;
+ protected static final int MOVE = R.id.action_move;
+ protected static final int MOVE_TO_WORKSPACE = R.id.action_move_to_workspace;
+ protected static final int RESIZE = R.id.action_resize;
+ protected static final int DEEP_SHORTCUTS = R.id.action_deep_shortcuts;
public enum DragType {
ICON,
@@ -65,7 +69,7 @@
public View item;
}
- private final SparseArray<AccessibilityAction> mActions = new SparseArray<>();
+ protected final SparseArray<AccessibilityAction> mActions = new SparseArray<>();
@Thunk final Launcher mLauncher;
private DragInfo mDragInfo = null;
@@ -88,14 +92,24 @@
launcher.getText(R.string.action_move_to_workspace)));
mActions.put(RESIZE, new AccessibilityAction(RESIZE,
launcher.getText(R.string.action_resize)));
+ mActions.put(DEEP_SHORTCUTS, new AccessibilityAction(DEEP_SHORTCUTS,
+ launcher.getText(R.string.action_deep_shortcut)));
}
@Override
public void onInitializeAccessibilityNodeInfo(View host, AccessibilityNodeInfo info) {
super.onInitializeAccessibilityNodeInfo(host, info);
+ addActions(host, info);
+ }
+
+ protected void addActions(View host, AccessibilityNodeInfo info) {
if (!(host.getTag() instanceof ItemInfo)) return;
ItemInfo item = (ItemInfo) host.getTag();
+ if (host instanceof BubbleTextView && ((BubbleTextView) host).hasDeepShortcuts()) {
+ info.addAction(mActions.get(DEEP_SHORTCUTS));
+ }
+
if (DeleteDropTarget.supportsAccessibleDrop(item)) {
info.addAction(mActions.get(REMOVE));
}
@@ -215,6 +229,9 @@
}
})
.show();
+ return true;
+ } else if (action == DEEP_SHORTCUTS) {
+ return DeepShortcutsContainer.showForIcon((BubbleTextView) host) != null;
}
return false;
}
@@ -397,7 +414,7 @@
/**
* Find empty space on the workspace and returns the screenId.
*/
- private long findSpaceOnWorkspace(ItemInfo info, int[] outCoordinates) {
+ protected long findSpaceOnWorkspace(ItemInfo info, int[] outCoordinates) {
Workspace workspace = mLauncher.getWorkspace();
ArrayList<Long> workspaceScreens = workspace.getScreenOrder();
long screenId;
diff --git a/src/com/android/launcher3/accessibility/ShortcutMenuAccessibilityDelegate.java b/src/com/android/launcher3/accessibility/ShortcutMenuAccessibilityDelegate.java
new file mode 100644
index 0000000..ff70279
--- /dev/null
+++ b/src/com/android/launcher3/accessibility/ShortcutMenuAccessibilityDelegate.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.launcher3.accessibility;
+
+import android.view.View;
+import android.view.accessibility.AccessibilityNodeInfo;
+
+import com.android.launcher3.ItemInfo;
+import com.android.launcher3.Launcher;
+import com.android.launcher3.LauncherModel;
+import com.android.launcher3.LauncherSettings;
+import com.android.launcher3.R;
+import com.android.launcher3.ShortcutInfo;
+
+import java.util.ArrayList;
+
+/**
+ * Extension of {@link LauncherAccessibilityDelegate} with actions specific to shortcuts in
+ * deep shortcuts menu.
+ */
+public class ShortcutMenuAccessibilityDelegate extends LauncherAccessibilityDelegate {
+
+ public ShortcutMenuAccessibilityDelegate(Launcher launcher) {
+ super(launcher);
+ }
+
+ @Override
+ protected void addActions(View host, AccessibilityNodeInfo info) {
+ info.addAction(mActions.get(ADD_TO_WORKSPACE));
+ }
+
+ @Override
+ public boolean performAction(View host, ItemInfo item, int action) {
+ if (action == ADD_TO_WORKSPACE) {
+ final ShortcutInfo info = (ShortcutInfo) item;
+ final int[] coordinates = new int[2];
+ final long screenId = findSpaceOnWorkspace(item, coordinates);
+ Runnable onComplete = new Runnable() {
+ @Override
+ public void run() {
+ 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);
+ mLauncher.closeShortcutsContainer();
+ announceConfirmation(R.string.item_added_to_workspace);
+ }
+ };
+
+ if (!mLauncher.showWorkspace(true, onComplete)) {
+ onComplete.run();
+ }
+ return true;
+ }
+ return false;
+ }
+}