Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a9934f00 authored by Hyunyoung Song's avatar Hyunyoung Song Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22293181



Change-Id: I57167b224875742ac7f31069e18ebb02460b54b9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 857c24a3 ec6c2591

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

+3 −2
Original line number Diff line number Diff line
@@ -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();

        }