summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/Utilities.java
diff options
context:
space:
mode:
authorJon Miranda <jonmiranda@google.com>2017-09-18 16:53:16 -0400
committerJon Miranda <jonmiranda@google.com>2017-09-18 16:53:16 -0400
commit7f55620089eb54a73a41fe0ba18d4f4ec720ebb7 (patch)
tree459afef125a9b5473eaa869534f45b3229aadcf0 /src/com/android/launcher3/Utilities.java
parentdff92fe1aa90dfad1cce228ee140a70ab7a365b2 (diff)
parentd926a9316f61a7540b00ecd42acba8013e715f92 (diff)
downloadandroid_packages_apps_Trebuchet-7f55620089eb54a73a41fe0ba18d4f4ec720ebb7.tar.gz
android_packages_apps_Trebuchet-7f55620089eb54a73a41fe0ba18d4f4ec720ebb7.tar.bz2
android_packages_apps_Trebuchet-7f55620089eb54a73a41fe0ba18d4f4ec720ebb7.zip
Merge branch 'ub-launcher3-dorval-polish2'
Bug: 64937210 Test: flashed img Change-Id: Id6a05e7be885bf5c53a41eab2573c6ae3a44dc55
Diffstat (limited to 'src/com/android/launcher3/Utilities.java')
-rw-r--r--src/com/android/launcher3/Utilities.java12
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;