diff options
author | Kenny Guy <kennyguy@google.com> | 2014-09-16 15:17:58 +0100 |
---|---|---|
committer | Kenny Guy <kennyguy@google.com> | 2014-09-18 13:07:49 +0100 |
commit | d794a3f46521b972fa02826d379d1efa112793d2 (patch) | |
tree | eec45aa7526a5984f9a7e99c411c6e337dfa9939 /src/com/android/launcher3/compat | |
parent | 83e5941d8ef6ca33bdd6278f6089c8d6d00de942 (diff) | |
download | android_packages_apps_Trebuchet-d794a3f46521b972fa02826d379d1efa112793d2.tar.gz android_packages_apps_Trebuchet-d794a3f46521b972fa02826d379d1efa112793d2.tar.bz2 android_packages_apps_Trebuchet-d794a3f46521b972fa02826d379d1efa112793d2.zip |
Update calls now we have an L API version.
Bug: 17543647
Change-Id: I92c652a4ced5a5e783b24e42f9da4d9dfe1118ba
Diffstat (limited to 'src/com/android/launcher3/compat')
4 files changed, 8 insertions, 7 deletions
diff --git a/src/com/android/launcher3/compat/AppWidgetManagerCompat.java b/src/com/android/launcher3/compat/AppWidgetManagerCompat.java index 5997e7b03..6512d427e 100644 --- a/src/com/android/launcher3/compat/AppWidgetManagerCompat.java +++ b/src/com/android/launcher3/compat/AppWidgetManagerCompat.java @@ -38,9 +38,8 @@ public abstract class AppWidgetManagerCompat { public static AppWidgetManagerCompat getInstance(Context context) { synchronized (sInstanceLock) { - // TODO change this to use api version once L gets an API number. if (sInstance == null) { - if (Utilities.isLmp()) { + if (Utilities.isLmpOrAbove()) { sInstance = new AppWidgetManagerCompatVL(context.getApplicationContext()); } else { sInstance = new AppWidgetManagerCompatV16(context.getApplicationContext()); diff --git a/src/com/android/launcher3/compat/LauncherAppsCompat.java b/src/com/android/launcher3/compat/LauncherAppsCompat.java index e3879eed0..6efcc00fd 100644 --- a/src/com/android/launcher3/compat/LauncherAppsCompat.java +++ b/src/com/android/launcher3/compat/LauncherAppsCompat.java @@ -23,6 +23,8 @@ import android.graphics.Rect; import android.os.Build; import android.os.Bundle; +import com.android.launcher3.Utilities; + import java.util.List; public abstract class LauncherAppsCompat { @@ -48,9 +50,8 @@ public abstract class LauncherAppsCompat { public static LauncherAppsCompat getInstance(Context context) { synchronized (sInstanceLock) { - // STOPSHIP(kennyguy) change this to use api version once L gets an API number. if (sInstance == null) { - if ("L".equals(Build.VERSION.CODENAME)) { + if (Utilities.isLmpOrAbove()) { sInstance = new LauncherAppsCompatVL(context.getApplicationContext()); } else { sInstance = new LauncherAppsCompatV16(context.getApplicationContext()); diff --git a/src/com/android/launcher3/compat/PackageInstallerCompat.java b/src/com/android/launcher3/compat/PackageInstallerCompat.java index 0ae52bd23..03857e693 100644 --- a/src/com/android/launcher3/compat/PackageInstallerCompat.java +++ b/src/com/android/launcher3/compat/PackageInstallerCompat.java @@ -32,7 +32,7 @@ public abstract class PackageInstallerCompat { public static PackageInstallerCompat getInstance(Context context) { synchronized (sInstanceLock) { if (sInstance == null) { - if (Utilities.isLmp()) { + if (Utilities.isLmpOrAbove()) { sInstance = new PackageInstallerCompatVL(context); } else { sInstance = new PackageInstallerCompatV16(context) { }; diff --git a/src/com/android/launcher3/compat/UserManagerCompat.java b/src/com/android/launcher3/compat/UserManagerCompat.java index 8effb81a1..1374b4e49 100644 --- a/src/com/android/launcher3/compat/UserManagerCompat.java +++ b/src/com/android/launcher3/compat/UserManagerCompat.java @@ -20,6 +20,8 @@ import android.content.Context; import android.graphics.drawable.Drawable; import android.os.Build; +import com.android.launcher3.Utilities; + import java.util.List; public abstract class UserManagerCompat { @@ -27,8 +29,7 @@ public abstract class UserManagerCompat { } public static UserManagerCompat getInstance(Context context) { - // TODO change this to use api version once L gets an API number. - if ("L".equals(Build.VERSION.CODENAME)) { + if (Utilities.isLmpOrAbove()) { return new UserManagerCompatVL(context); } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) { return new UserManagerCompatV17(context); |