diff options
author | Tony Wickham <twickham@google.com> | 2016-05-18 01:05:48 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-05-18 01:05:48 +0000 |
commit | 63d1b330bfe7942c5a53d53010b6f5e6dea0945c (patch) | |
tree | 5069a07dc747c073aeee947d82f9865f3b818ae5 | |
parent | aaf7d1d13bd88bdeac5c56a9ab1d293fdaea3c11 (diff) | |
parent | df23837d99c68a0035bd1fdfbf0e2a0888d7519e (diff) | |
download | android_packages_apps_Trebuchet-63d1b330bfe7942c5a53d53010b6f5e6dea0945c.tar.gz android_packages_apps_Trebuchet-63d1b330bfe7942c5a53d53010b6f5e6dea0945c.tar.bz2 android_packages_apps_Trebuchet-63d1b330bfe7942c5a53d53010b6f5e6dea0945c.zip |
Merge "Only show App Info drag target if developer settings are enabled." into ub-launcher3-calgary
-rw-r--r-- | src/com/android/launcher3/InfoDropTarget.java | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/com/android/launcher3/InfoDropTarget.java b/src/com/android/launcher3/InfoDropTarget.java index 191becf13..259370c1c 100644 --- a/src/com/android/launcher3/InfoDropTarget.java +++ b/src/com/android/launcher3/InfoDropTarget.java @@ -18,7 +18,9 @@ package com.android.launcher3; 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 class InfoDropTarget extends UninstallDropTarget { } 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); } } |