| commit | b33e38242f4c4bee4e94001f8f6610602d84cc93 | [log] [tgz] |
|---|---|---|
| author | Steven Ng <stevenckng@google.com> | Thu Jun 17 09:19:45 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jun 17 09:19:45 2021 +0000 |
| tree | fbda4d6e69170e4d090b4cb06848a7c6b6f05a2e | |
| parent | 595c7ced57e9224f4d3e7eb47b4f13b42ef0553e [diff] | |
| parent | 1184a03b086cb839b5f4265117e2a7da11c6c17d [diff] |
Merge "Modify AT_LEAST_S check to include SDK int" into sc-dev am: 1184a03b08 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15002455 Change-Id: I9a2ed9eb320f6b8ce469d1c4fca96fb8218953fd
diff --git a/src/com/android/launcher3/Utilities.java b/src/com/android/launcher3/Utilities.java index 2ef9e3e..3cabc87 100644 --- a/src/com/android/launcher3/Utilities.java +++ b/src/com/android/launcher3/Utilities.java
@@ -123,7 +123,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)}.