commit ec6c2591c5c672d0e6b71f45781b0d0c480a52be
author Hyunyoung Song <hyunyoungs@google.com> Mon Mar 27 23:02:38 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Mar 27 23:02:38 2023 +0000
tree 4487688b06ec88a39925dcecc5035922cd549d17
parent 6fcdfb166de778eed26d63188954001e318daed8
parent fa9dbe32915d8f4392a2c3417d33cec09f17e1ae

Merge "Fix lint error in errorprone target (only in tm-qpr-dev)" into tm-qpr-dev

src/com/android/launcher3/views/ActivityContext.java

diff --git a/src/com/android/launcher3/views/ActivityContext.java b/src/com/android/launcher3/views/ActivityContext.java
index 10f40b7..a6744fb 100644
--- a/src/com/android/launcher3/views/ActivityContext.java
+++ b/src/com/android/launcher3/views/ActivityContext.java
@@ -324,8 +324,9 @@
         Bundle optsBundle = null;
         if (v != null) {
             optsBundle = getActivityLaunchOptions(v, item).toBundle();
-        } else if (item != null && item.animationType == LauncherSettings.Animation.DEFAULT_NO_ICON
-                && Utilities.ATLEAST_T) {
+        } else if (android.os.Build.VERSION.SDK_INT >= 33
+                && item != null
+                && item.animationType == LauncherSettings.Animation.DEFAULT_NO_ICON) {
             optsBundle = ActivityOptions.makeBasic()
                     .setSplashScreenStyle(SplashScreen.SPLASH_SCREEN_STYLE_SOLID_COLOR).toBundle();
         }