commit 1184a03b086cb839b5f4265117e2a7da11c6c17d
author Steven Ng <stevenckng@google.com> Thu Jun 17 09:09:21 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jun 17 09:09:21 2021 +0000
tree be69038ec4672b7157c46c41ecdd069593ef7788
parent e8772c1659a89379c1fc6e6caf1eeb34d092c149
parent 7e31e9b2676fa7049125453469d867bf3887c7ef

Merge "Modify AT_LEAST_S check to include SDK int" into sc-dev

src/com/android/launcher3/Utilities.java

diff --git a/src/com/android/launcher3/Utilities.java b/src/com/android/launcher3/Utilities.java
index a2d86bc..75f6278 100644
--- a/src/com/android/launcher3/Utilities.java
+++ b/src/com/android/launcher3/Utilities.java
@@ -122,7 +122,8 @@
 
     public static final boolean ATLEAST_R = Build.VERSION.SDK_INT >= Build.VERSION_CODES.R;
 
-    public static final boolean ATLEAST_S = BuildCompat.isAtLeastS();
+    public static final boolean ATLEAST_S = BuildCompat.isAtLeastS()
+            || Build.VERSION.SDK_INT >= Build.VERSION_CODES.S;
 
     /**
      * Set on a motion event dispatched from the nav bar. See {@link MotionEvent#setEdgeFlags(int)}.