| commit | 5da5694f4ed476b210475faa38c7fb51e71758d0 | [log] [tgz] |
|---|---|---|
| author | Steven Ng <stevenckng@google.com> | Thu Jun 17 09:18:53 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jun 17 09:18:53 2021 +0000 |
| tree | 36be7badecb099467e1a3c3fcb673fae75961960 | |
| parent | 97c87717980b8a402a8d3863f3077aa6231c1360 [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: I8eb4280704cc3528ec06cd16ed3c4eb2b7f535b5
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)}.