diff options
author | Tony Wickham <twickham@google.com> | 2016-05-18 01:10:48 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-05-18 01:10:48 +0000 |
commit | 53d9b5282ac292a92dcaab99a597b298736da654 (patch) | |
tree | 5069a07dc747c073aeee947d82f9865f3b818ae5 /src | |
parent | 73306bf56be85cb1b732471a1f674223956850fe (diff) | |
parent | 63d1b330bfe7942c5a53d53010b6f5e6dea0945c (diff) | |
download | android_packages_apps_Trebuchet-53d9b5282ac292a92dcaab99a597b298736da654.tar.gz android_packages_apps_Trebuchet-53d9b5282ac292a92dcaab99a597b298736da654.tar.bz2 android_packages_apps_Trebuchet-53d9b5282ac292a92dcaab99a597b298736da654.zip |
Merge "Only show App Info drag target if developer settings are enabled." into ub-launcher3-calgary
am: 63d1b330bf
* commit '63d1b330bfe7942c5a53d53010b6f5e6dea0945c':
Only show App Info drag target if developer settings are enabled.
Change-Id: I911691ad21475e8bf3fd694b07a39fb2e17af776
Diffstat (limited to 'src')
-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); } } |