Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c59116a6 authored by Pinyao Ting's avatar Pinyao Ting
Browse files

resolve merge conflicts of 8a739f95 to ub-launcher3-master 

Bug: None
Change-Id: Ieb5ae70464d4fa964622310c67e0dd4b58660cc3
Test: I solemnly swear I tested this conflict resolution.
parents fb553edb 8a739f95

src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java

+11 −2
Original line number Diff line number Diff line 
package com.android.launcher3.accessibility;



import static android.view.accessibility.AccessibilityNodeInfo.ACTION_LONG_CLICK;



import static com.android.launcher3.LauncherState.NORMAL;



import android.app.AlertDialog;
@@ -30,14 +32,14 @@ import com.android.launcher3.LauncherSettings; 
import com.android.launcher3.LauncherSettings.Favorites;

import com.android.launcher3.PendingAddItemInfo;

import com.android.launcher3.R;

import com.android.launcher3.WorkspaceItemInfo;

import com.android.launcher3.Workspace;

import com.android.launcher3.WorkspaceItemInfo;

import com.android.launcher3.dragndrop.DragController.DragListener;

import com.android.launcher3.dragndrop.DragOptions;

import com.android.launcher3.folder.Folder;

import com.android.launcher3.keyboard.CustomActionsPopup;

import com.android.launcher3.notification.NotificationListener;

import com.android.launcher3.popup.PopupContainerWithArrow;

import com.android.launcher3.shortcuts.DeepShortcutManager;

import com.android.launcher3.touch.ItemLongClickListener;

import com.android.launcher3.util.IntArray;

import com.android.launcher3.util.ShortcutUtil;
@@ -164,6 +166,13 @@ public class LauncherAccessibilityDelegate extends AccessibilityDelegate impleme 
    }



    public boolean performAction(final View host, final ItemInfo item, int action) {

        if (action == ACTION_LONG_CLICK && ShortcutUtil.isDeepShortcut(item)) {

            CustomActionsPopup popup = new CustomActionsPopup(mLauncher, host);

            if (popup.canShow()) {

                popup.show();

                return true;

            }

        }

        if (action == MOVE) {

            beginAccessibleDrag(host, item);

        } else if (action == ADD_TO_WORKSPACE) {

src/com/android/launcher3/util/ShortcutUtil.java

+54 −34
Original line number Diff line number Diff line
@@ -23,22 +23,42 @@ import com.android.launcher3.model.WidgetsModel; 
import com.android.launcher3.shortcuts.ShortcutKey;



public class ShortcutUtil {

    /**

     * Returns true when we should show shortcut menu for the item.

     */

    public static boolean supportsShortcuts(ItemInfo info) {

        return isActive(info) && (isApp(info) || isPinnedShortcut(info));

    }



    /**

     * Returns true when we should show depp shortcuts in shortcut menu for the item.

     */

    public static boolean supportsDeepShortcuts(ItemInfo info) {

        return isActive(info) && isApp(info);

    }



    /**

     * Returns the shortcut id if the item is a pinned shortcut.

     */

    public static String getShortcutIdIfPinnedShortcut(ItemInfo info) {

    return isActive(info) && isPinnedShortcut(info) ?

        ShortcutKey.fromItemInfo(info).getId() : null;

        return isActive(info) && isPinnedShortcut(info)

                ? ShortcutKey.fromItemInfo(info).getId() : null;

    }



    /**

     * Returns the person keys associated with the item. (Has no function right now.)

     */

    public static String[] getPersonKeysIfPinnedShortcut(ItemInfo info) {

    return isActive(info) && isPinnedShortcut(info) ?

        ((WorkspaceItemInfo) info).getPersonKeys() : Utilities.EMPTY_STRING_ARRAY;

        return isActive(info) && isPinnedShortcut(info)

                ? ((WorkspaceItemInfo) info).getPersonKeys() : Utilities.EMPTY_STRING_ARRAY;

    }



    /**

     * Returns true if the item is a deep shortcut.

     */

    public static boolean isDeepShortcut(ItemInfo info) {

        return info.itemType == LauncherSettings.Favorites.ITEM_TYPE_DEEP_SHORTCUT

                && info instanceof WorkspaceItemInfo;

    }



    private static boolean isActive(ItemInfo info) {