commit df23837d99c68a0035bd1fdfbf0e2a0888d7519e
author Tony Wickham <twickham@google.com> Tue May 17 12:19:07 2016 -0700
committer Tony Wickham <twickham@google.com> Tue May 17 17:52:39 2016 -0700
tree 43e0b8dbd1ca8a2685d42c4b2f9842eabe5afbc0
parent f898b970cc9130d629d4bc969222aaa96a8a013a

Only show App Info drag target if developer settings are enabled.

Bug: 28794577
Change-Id: Ia515a627a4f94121c47386829c6772bea42e70f1

src/com/android/launcher3/InfoDropTarget.java

diff --git a/src/com/android/launcher3/InfoDropTarget.java b/src/com/android/launcher3/InfoDropTarget.java
index 191becf..259370c 100644
--- a/src/com/android/launcher3/InfoDropTarget.java
+++ b/src/com/android/launcher3/InfoDropTarget.java
@@ -18,7 +18,9 @@
 
 import android.content.ActivityNotFoundException;
 import android.content.ComponentName;
+import android.content.ContentResolver;
 import android.content.Context;
+import android.provider.Settings;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.widget.Toast;
@@ -92,7 +94,12 @@
     }
 
     public static boolean supportsDrop(ItemInfo info) {
-        return info instanceof AppInfo || info instanceof ShortcutInfo
-                || info instanceof PendingAddItemInfo || info instanceof LauncherAppWidgetInfo;
+        // Only show the App Info drop target if developer settings are enabled.
+        ContentResolver resolver = LauncherAppState.getInstance().getContext().getContentResolver();
+        boolean developmentSettingsEnabled = Settings.Global.getInt(resolver,
+                Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 0) == 1;
+        return developmentSettingsEnabled
+                && (info instanceof AppInfo || info instanceof ShortcutInfo
+                || info instanceof PendingAddItemInfo || info instanceof LauncherAppWidgetInfo);
     }
 }