| commit | e2ae6828156c84732183b6abb5050583639b7f6e | [log] [tgz] |
|---|---|---|
| author | Steven Ng <stevenckng@google.com> | Thu Jun 17 09:36:32 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jun 17 09:36:32 2021 +0000 |
| tree | 0c66b8c950ca74911020c3f02f28464ea2531763 | |
| parent | 920614b41b73ee43c043b0f5e8888dc1513f9862 [diff] | |
| parent | b33e38242f4c4bee4e94001f8f6610602d84cc93 [diff] |
Merge "Modify AT_LEAST_S check to include SDK int" into sc-dev am: 1184a03b08 am: b33e38242f Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15002455 Change-Id: Id1989e0eac7ac90b05bdadba912f384d6d1ceda6
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)}.