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

Commit 9b372aa2 authored by Wei Sheng Shih's avatar Wei Sheng Shih Committed by Automerger Merge Worker
Browse files

Merge "Fix missing check empty style splash screen when task switch." into sc-v2-dev am: 7bf1e9b7 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15884448

Change-Id: Iaf310869a0adfcdf7d5b5d679f23903f49682122
parents 92dc9fe9 7bf1e9b7

libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/phone/PhoneStartingWindowTypeAlgorithm.java

+4 −14
Original line number Diff line number Diff line
@@ -71,23 +71,13 @@ public class PhoneStartingWindowTypeAlgorithm implements StartingWindowTypeAlgor 
                    + " topIsHome:" + topIsHome);

        }



        final int visibleSplashScreenType = legacySplashScreen

                ? STARTING_WINDOW_TYPE_LEGACY_SPLASH_SCREEN

                : STARTING_WINDOW_TYPE_SPLASH_SCREEN;



        if (!topIsHome) {

            if (!processRunning) {

            if (!processRunning || newTask || (taskSwitch && !activityCreated)) {

                return useEmptySplashScreen

                        ? STARTING_WINDOW_TYPE_EMPTY_SPLASH_SCREEN

                        : visibleSplashScreenType;

            }

            if (newTask) {

                return useEmptySplashScreen

                        ? STARTING_WINDOW_TYPE_EMPTY_SPLASH_SCREEN

                        : visibleSplashScreenType;

            }

            if (taskSwitch && !activityCreated) {

                return visibleSplashScreenType;

                        : legacySplashScreen

                                ? STARTING_WINDOW_TYPE_LEGACY_SPLASH_SCREEN

                                : STARTING_WINDOW_TYPE_SPLASH_SCREEN;

            }

        }

        if (taskSwitch && allowTaskSnapshot) {