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

This commit is contained in:
Hyunyoung Song
2023-03-27 23:02:38 +00:00
committed by Android (Google) Code Review

View File

@@ -324,8 +324,9 @@ public interface ActivityContext {
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();
}