diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2016-08-16 02:44:51 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-08-16 02:44:51 +0000 |
| commit | 6fbdc09e1c8caf2702dff47b4619f348de7d1911 (patch) | |
| tree | 7a6e1090c30109365fb007ed370559b5b80f3fe0 /src | |
| parent | 5a17fe6ca09964f150b459c495a2c37742da75f5 (diff) | |
| parent | a9206128a2a7033269056527e38fa7d9fd1c2a68 (diff) | |
| download | android_packages_apps_Trebuchet-6fbdc09e1c8caf2702dff47b4619f348de7d1911.tar.gz android_packages_apps_Trebuchet-6fbdc09e1c8caf2702dff47b4619f348de7d1911.tar.bz2 android_packages_apps_Trebuchet-6fbdc09e1c8caf2702dff47b4619f348de7d1911.zip | |
Merge "Updating version check to use SDK_INT" into ub-launcher3-calgary
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher3/Utilities.java | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/com/android/launcher3/Utilities.java b/src/com/android/launcher3/Utilities.java index 2cbad53dc..50f715634 100644 --- a/src/com/android/launcher3/Utilities.java +++ b/src/com/android/launcher3/Utilities.java @@ -45,7 +45,6 @@ import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; import android.graphics.drawable.PaintDrawable; import android.os.Build; -import android.os.Build.VERSION; import android.os.Bundle; import android.os.PowerManager; import android.text.Spannable; @@ -59,7 +58,6 @@ import android.util.SparseArray; import android.util.TypedValue; import android.view.MotionEvent; import android.view.View; -import android.view.ViewParent; import android.widget.Toast; import com.android.launcher3.compat.UserHandleCompat; @@ -71,7 +69,6 @@ import com.android.launcher3.util.IconNormalizer; import java.io.ByteArrayOutputStream; import java.io.Closeable; import java.io.IOException; -import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.ArrayList; import java.util.Collection; @@ -108,9 +105,7 @@ public final class Utilities { private static final int[] sLoc1 = new int[2]; public static boolean isNycMR1OrAbove() { - // TODO: Use the check from support lib - return !"REL".equals(VERSION.CODENAME) - && "NMR1".compareTo(VERSION.CODENAME) <= 0; + return Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1; } public static final boolean ATLEAST_MARSHMALLOW = |