| commit | f296b3421da43f332e0a71964e93d79e9fd63b5a | [log] [tgz] |
|---|---|---|
| author | Hyunyoung Song <hyunyoungs@google.com> | Mon Mar 27 23:29:58 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Mar 27 23:29:58 2023 +0000 |
| tree | bcc2d022dbc3d0f55731a61dce3078c614ca37cc | |
| parent | 4f45b24af91e76624edcda100d62eeaca555f3c9 [diff] | |
| parent | a9934f00d3f065ad85a0583b0b020ef60ffea87f [diff] |
Merge "Fix lint error in errorprone target (only in tm-qpr-dev)" into tm-qpr-dev am: ec6c2591c5 am: a9934f00d3 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22293181 Change-Id: I143623634c6ba0bc6721dcea7c4913b0f51cf99b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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(); }