summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTony Wickham <twickham@google.com>2016-08-09 21:52:42 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-08-09 21:52:43 +0000
commit1ba0e4df79436e89b52491115286214dd631ecc0 (patch)
treeae07c115705c1601f8968d7ed6c880274c0afa43 /src
parentea5bcba847a5740b29485ea40d2419841c8cd62c (diff)
parentdf64e9ee06bc8dde8ad5ca3156adf8e0f27e0c9e (diff)
downloadandroid_packages_apps_Trebuchet-1ba0e4df79436e89b52491115286214dd631ecc0.tar.gz
android_packages_apps_Trebuchet-1ba0e4df79436e89b52491115286214dd631ecc0.tar.bz2
android_packages_apps_Trebuchet-1ba0e4df79436e89b52491115286214dd631ecc0.zip
Merge "Change drag from shortcuts to say "Cancel" instead of "Remove"" into ub-launcher3-calgary
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher3/shortcuts/DeepShortcutsContainer.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/launcher3/shortcuts/DeepShortcutsContainer.java b/src/com/android/launcher3/shortcuts/DeepShortcutsContainer.java
index ce3348df7..2542df6a2 100644
--- a/src/com/android/launcher3/shortcuts/DeepShortcutsContainer.java
+++ b/src/com/android/launcher3/shortcuts/DeepShortcutsContainer.java
@@ -566,7 +566,7 @@ public class DeepShortcutsContainer extends LinearLayout implements View.OnLongC
@Override
public boolean supportsDeleteDropTarget() {
- return true;
+ return false;
}
@Override