diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2015-09-25 11:50:16 -0700 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2015-09-25 11:50:16 -0700 |
commit | 9d4380856ff41ecb26c0d5aee1747b6060d2ef0e (patch) | |
tree | 59f1195b66f6adab842c52e86c3e83688b835a3b /src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java | |
parent | 1f832f85d59600fc4c212dec51a5112a6b7427d5 (diff) | |
parent | e78e3d734b577c1ab6dc0738a83600374908ea52 (diff) | |
download | android_packages_apps_Trebuchet-9d4380856ff41ecb26c0d5aee1747b6060d2ef0e.tar.gz android_packages_apps_Trebuchet-9d4380856ff41ecb26c0d5aee1747b6060d2ef0e.tar.bz2 android_packages_apps_Trebuchet-9d4380856ff41ecb26c0d5aee1747b6060d2ef0e.zip |
resolved conflicts for e78e3d73 to ub-launcher3-master
Change-Id: Idc119a57e21cf6016ee0fd91866839301db072d6
Diffstat (limited to 'src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java')
-rw-r--r-- | src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java b/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java index 947968587..f8bf5a85b 100644 --- a/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java +++ b/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java @@ -134,11 +134,8 @@ public class LauncherAccessibilityDelegate extends AccessibilityDelegate impleme 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; + DeleteDropTarget.removeWorkspaceOrFolderItem(mLauncher, item, host); + return true; } else if (action == INFO) { InfoDropTarget.startDetailsActivityForInfo(item, mLauncher); return true; |