summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSunny Goyal <sunnygoyal@google.com>2015-06-12 19:28:34 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-06-12 19:28:35 +0000
commit3d2e49d7b9dd63d875e8ac13e58895ad20a91a7a (patch)
tree107ee91b11d7b87d6621353f4742bb80562435c1
parente89cf793ab22fcb8cea3ff94ca981659208446db (diff)
parentd7da55fc3230df43b3b0090960b3184e88309ff5 (diff)
downloadandroid_packages_apps_Trebuchet-3d2e49d7b9dd63d875e8ac13e58895ad20a91a7a.tar.gz
android_packages_apps_Trebuchet-3d2e49d7b9dd63d875e8ac13e58895ad20a91a7a.tar.bz2
android_packages_apps_Trebuchet-3d2e49d7b9dd63d875e8ac13e58895ad20a91a7a.zip
Merge "Removing developer options check for app info target" into ub-launcher3-burnaby
-rw-r--r--src/com/android/launcher3/InfoDropTarget.java15
1 files changed, 1 insertions, 14 deletions
diff --git a/src/com/android/launcher3/InfoDropTarget.java b/src/com/android/launcher3/InfoDropTarget.java
index 0ede2fc11..d93cdcc1b 100644
--- a/src/com/android/launcher3/InfoDropTarget.java
+++ b/src/com/android/launcher3/InfoDropTarget.java
@@ -16,11 +16,8 @@
package com.android.launcher3;
-import android.annotation.TargetApi;
import android.content.ComponentName;
import android.content.Context;
-import android.os.Build;
-import android.provider.Settings;
import android.util.AttributeSet;
import com.android.launcher3.compat.UserHandleCompat;
@@ -70,18 +67,8 @@ public class InfoDropTarget extends ButtonDropTarget {
return source.supportsAppInfoDropTarget() && supportsDrop(getContext(), info);
}
- @SuppressWarnings("deprecation")
- @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR1)
public static boolean supportsDrop(Context context, Object info) {
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
- return (Settings.Global.getInt(context.getContentResolver(),
- Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 0) == 1) &&
- (info instanceof AppInfo || info instanceof PendingAddItemInfo);
- } else {
- return (Settings.Secure.getInt(context.getContentResolver(),
- Settings.Secure.DEVELOPMENT_SETTINGS_ENABLED, 0) == 1) &&
- (info instanceof AppInfo || info instanceof PendingAddItemInfo);
- }
+ return info instanceof AppInfo || info instanceof PendingAddItemInfo;
}
@Override