diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-09-11 21:40:47 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-09-11 21:40:47 +0000 |
| commit | 673f917d57f47482aa1a823e74f0377315f30293 (patch) | |
| tree | 730290c4e76f907f473e7fac3c4ac3e6f25dc23a /src/com/android/launcher3/Utilities.java | |
| parent | a41ebf0cd2c2cd95a377c824acb517894ebbd372 (diff) | |
| parent | e24cb63b811e2885a69e7df794e9972cdf5a57b9 (diff) | |
| download | android_packages_apps_Trebuchet-673f917d57f47482aa1a823e74f0377315f30293.tar.gz android_packages_apps_Trebuchet-673f917d57f47482aa1a823e74f0377315f30293.tar.bz2 android_packages_apps_Trebuchet-673f917d57f47482aa1a823e74f0377315f30293.zip | |
Merge "WallpaperManagerCompat should target correct platform Also replace Utilities.isAtLeastO() to static final constant. Bug: 65544683" into ub-launcher3-dorval-polish2
Diffstat (limited to 'src/com/android/launcher3/Utilities.java')
| -rw-r--r-- | src/com/android/launcher3/Utilities.java | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/com/android/launcher3/Utilities.java b/src/com/android/launcher3/Utilities.java index 3aa2db000..b6876f670 100644 --- a/src/com/android/launcher3/Utilities.java +++ b/src/com/android/launcher3/Utilities.java @@ -83,15 +83,17 @@ public final class Utilities { private static final Matrix sMatrix = new Matrix(); private static final Matrix sInverseMatrix = new Matrix(); - public static boolean isAtLeastO() { - return Build.VERSION.SDK_INT >= Build.VERSION_CODES.O; - } + public static final boolean ATLEAST_OREO_MR1 = + Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1; + + public static final boolean ATLEAST_OREO = + Build.VERSION.SDK_INT >= Build.VERSION_CODES.O; public static final boolean ATLEAST_NOUGAT_MR1 = - Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1; + Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1; public static final boolean ATLEAST_NOUGAT = - Build.VERSION.SDK_INT >= Build.VERSION_CODES.N; + Build.VERSION.SDK_INT >= Build.VERSION_CODES.N; public static final boolean ATLEAST_MARSHMALLOW = Build.VERSION.SDK_INT >= Build.VERSION_CODES.M; |