commit 6eac7881d4938df399a624b5ec68dbe8b8c932bc
author Sunny Goyal <sunnygoyal@google.com> Thu Aug 11 00:01:46 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Aug 11 00:01:47 2016 +0000
tree 54dfb94d735ba9774262cec9a08a1e82a3fd7990
parent cb782bd43af2923c5522b8f968b0e4e39d7096bc
parent 95f3d6ba2ca02a9841487777cfff43fb9df65ec7

Merge "Reloading workspace when the shortcuts permission changes" into ub-launcher3-calgary

res/values-mr-rIN/strings.xml

diff --git a/res/values-mr-rIN/strings.xml b/res/values-mr-rIN/strings.xml
index 6dfa3d8..b680fea 100644
--- a/res/values-mr-rIN/strings.xml
+++ b/res/values-mr-rIN/strings.xml
@@ -102,5 +102,5 @@
     <string name="action_decrease_height" msgid="282377193880900022">"उंची कमी करा"</string>
     <string name="widget_resized" msgid="9130327887929620">"विजेटचा आकार रुंदी <xliff:g id="NUMBER_0">%1$s</xliff:g> उंची <xliff:g id="NUMBER_1">%2$s</xliff:g> मध्ये बदलला"</string>
     <string name="action_deep_shortcut" msgid="2864038805849372848">"शॉर्टकट"</string>
-    <string name="shortcuts_menu_description" msgid="406159963824238648">"<xliff:g id="APP_NAME">%2$s</xliff:g> साठी <xliff:g id="NUMBER_OF_SHORTCUTS">%1$d</xliff:g>"</string>
+    <string name="shortcuts_menu_description" msgid="406159963824238648">"<xliff:g id="APP_NAME">%2$s</xliff:g> साठी <xliff:g id="NUMBER_OF_SHORTCUTS">%1$d</xliff:g> शॉर्टकट"</string>
 </resources>

src/com/android/launcher3/shortcuts/DeepShortcutsContainer.java

diff --git a/src/com/android/launcher3/shortcuts/DeepShortcutsContainer.java b/src/com/android/launcher3/shortcuts/DeepShortcutsContainer.java
index ce3348d..2542df6 100644
--- a/src/com/android/launcher3/shortcuts/DeepShortcutsContainer.java
+++ b/src/com/android/launcher3/shortcuts/DeepShortcutsContainer.java
@@ -566,7 +566,7 @@
 
     @Override
     public boolean supportsDeleteDropTarget() {
-        return true;
+        return false;
     }
 
     @Override