diff options
| author | Tony Wickham <twickham@google.com> | 2017-05-19 12:17:02 -0700 |
|---|---|---|
| committer | Tony Wickham <twickham@google.com> | 2017-05-19 12:17:02 -0700 |
| commit | 3720c69322210e2e196ad93bf856eadc3a956177 (patch) | |
| tree | 986c9d06cb25078fca44fdda8fd01604bb83e3ba /src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java | |
| parent | 4de0ddc4f16ea7d89f20cac68380f3095fd83f91 (diff) | |
| parent | 8af16760dcb367dc7568ae3736b797cd2c8406c1 (diff) | |
| download | android_packages_apps_Trebuchet-3720c69322210e2e196ad93bf856eadc3a956177.tar.gz android_packages_apps_Trebuchet-3720c69322210e2e196ad93bf856eadc3a956177.tar.bz2 android_packages_apps_Trebuchet-3720c69322210e2e196ad93bf856eadc3a956177.zip | |
resolve merge conflicts of 8af16760d to ub-launcher3-dorval-polish
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I4cdfeebd09be58270c249429104d91dc9a31b49c
Diffstat (limited to 'src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java')
| -rw-r--r-- | src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java b/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java index e8127c45f..34335330b 100644 --- a/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java +++ b/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java @@ -36,6 +36,7 @@ import com.android.launcher3.dragndrop.DragController.DragListener; import com.android.launcher3.dragndrop.DragOptions; import com.android.launcher3.folder.Folder; import com.android.launcher3.popup.PopupContainerWithArrow; +import com.android.launcher3.shortcuts.DeepShortcutManager; import com.android.launcher3.util.Thunk; import java.util.ArrayList; @@ -103,8 +104,7 @@ public class LauncherAccessibilityDelegate extends AccessibilityDelegate impleme // If the request came from keyboard, do not add custom shortcuts as that is already // exposed as a direct shortcut - if (!fromKeyboard && host instanceof BubbleTextView - && ((BubbleTextView) host).hasDeepShortcuts()) { + if (!fromKeyboard && DeepShortcutManager.supportsShortcuts(item)) { info.addAction(mActions.get(DEEP_SHORTCUTS)); } |