Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Iaf310869a0adfcdf7d5b5d679f23903f49682122
This commit is contained in:
Wei Sheng Shih
2021-09-23 06:03:16 +00:00
committed by Automerger Merge Worker
parent 92dc9fe98d 7bf1e9b7c6
commit 9b372aa2af
1 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -71,23 +71,13 @@ public class PhoneStartingWindowTypeAlgorithm implements StartingWindowTypeAlgor
+ " topIsHome:" + topIsHome); + " topIsHome:" + topIsHome);
} }
final int visibleSplashScreenType = legacySplashScreen
? STARTING_WINDOW_TYPE_LEGACY_SPLASH_SCREEN
: STARTING_WINDOW_TYPE_SPLASH_SCREEN;
if (!topIsHome) { if (!topIsHome) {
if (!processRunning) { if (!processRunning || newTask || (taskSwitch && !activityCreated)) {
return useEmptySplashScreen return useEmptySplashScreen
? STARTING_WINDOW_TYPE_EMPTY_SPLASH_SCREEN ? STARTING_WINDOW_TYPE_EMPTY_SPLASH_SCREEN
: visibleSplashScreenType; : legacySplashScreen
} ? STARTING_WINDOW_TYPE_LEGACY_SPLASH_SCREEN
if (newTask) { : STARTING_WINDOW_TYPE_SPLASH_SCREEN;
return useEmptySplashScreen
? STARTING_WINDOW_TYPE_EMPTY_SPLASH_SCREEN
: visibleSplashScreenType;
}
if (taskSwitch && !activityCreated) {
return visibleSplashScreenType;
} }
} }
if (taskSwitch && allowTaskSnapshot) { if (taskSwitch && allowTaskSnapshot) {