diff options
| author | Tony Wickham <twickham@google.com> | 2015-10-01 13:04:22 -0700 |
|---|---|---|
| committer | Tony Wickham <twickham@google.com> | 2015-10-05 10:58:15 -0700 |
| commit | 9aae47f8a6e23f1805ee3d44512fc1f80286e6dd (patch) | |
| tree | d27a147f70bcea483fd3e15917a0145a7997d7b4 /src/com/android/launcher3/accessibility | |
| parent | b99d74bb0589dcbaf8167af60fd29be0b42f3139 (diff) | |
| download | android_packages_apps_Trebuchet-9aae47f8a6e23f1805ee3d44512fc1f80286e6dd.tar.gz android_packages_apps_Trebuchet-9aae47f8a6e23f1805ee3d44512fc1f80286e6dd.tar.bz2 android_packages_apps_Trebuchet-9aae47f8a6e23f1805ee3d44512fc1f80286e6dd.zip | |
Added 'Cancel' drop target from all apps and widget picker.
- Reuse DeleteDropTarget since it's the same effect, but with "Cancel"
instead of "Remove" if supportsDeleteDropTarget() returns false.
- Rename related strings (but not their values)
Bug: 24104015
Bug: 24099531
Change-Id: Ia9fbcaa17bb17f7aa31df1f830298da01544c178
Diffstat (limited to 'src/com/android/launcher3/accessibility')
| -rw-r--r-- | src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java b/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java index f8bf5a85b..f5db6c0b6 100644 --- a/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java +++ b/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java @@ -75,11 +75,11 @@ public class LauncherAccessibilityDelegate extends AccessibilityDelegate impleme mLauncher = launcher; mActions.put(REMOVE, new AccessibilityAction(REMOVE, - launcher.getText(R.string.delete_target_label))); + launcher.getText(R.string.remove_drop_target_label))); mActions.put(INFO, new AccessibilityAction(INFO, - launcher.getText(R.string.info_target_label))); + launcher.getText(R.string.app_info_drop_target_label))); mActions.put(UNINSTALL, new AccessibilityAction(UNINSTALL, - launcher.getText(R.string.delete_target_uninstall_label))); + launcher.getText(R.string.uninstall_drop_target_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, @@ -96,7 +96,7 @@ public class LauncherAccessibilityDelegate extends AccessibilityDelegate impleme if (!(host.getTag() instanceof ItemInfo)) return; ItemInfo item = (ItemInfo) host.getTag(); - if (DeleteDropTarget.supportsDrop(item)) { + if (DeleteDropTarget.supportsAccessibleDrop(item)) { info.addAction(mActions.get(REMOVE)); } if (UninstallDropTarget.supportsDrop(host.getContext(), item)) { |