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

Merge "Create splash screen if activity launched with FLAG_ACTIVITY_CLEAR_TASK" into sc-dev

Browse Source
This commit is contained in:
Wei Sheng Shih
2021-06-24 01:41:09 +00:00
committed by Android (Google) Code Review
parent 388e0cba03 ed9c44a273
commit 3abf2a7ca9
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
services/core/java/com/android/server/wm/ActivityRecord.java
View File

@@ -6286,12 +6286,18 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
final int resolvedTheme = evaluateStartingWindowTheme(prev, packageName, theme, final int resolvedTheme = evaluateStartingWindowTheme(prev, packageName, theme,
splashScreenTheme); splashScreenTheme);
final boolean activityCreated =
mState.ordinal() >= STARTED.ordinal() && mState.ordinal() <= STOPPED.ordinal();
// If this activity is just created and all activities below are finish, treat this
// scenario as warm launch.
final boolean newSingleActivity = !newTask && !activityCreated
&& task.getActivity((r) -> !r.finishing && r != this) == null;
final boolean shown = addStartingWindow(packageName, resolvedTheme, final boolean shown = addStartingWindow(packageName, resolvedTheme,
compatInfo, nonLocalizedLabel, labelRes, icon, logo, windowFlags, compatInfo, nonLocalizedLabel, labelRes, icon, logo, windowFlags,
prev != null ? prev.appToken : null, newTask, taskSwitch, isProcessRunning(), prev != null ? prev.appToken : null,
allowTaskSnapshot(), newTask || newSingleActivity, taskSwitch, isProcessRunning(),
mState.ordinal() >= STARTED.ordinal() && mState.ordinal() <= STOPPED.ordinal(), allowTaskSnapshot(), activityCreated, mSplashScreenStyleEmpty);
mSplashScreenStyleEmpty);
if (shown) { if (shown) {
mStartingWindowState = STARTING_WINDOW_SHOWN; mStartingWindowState = STARTING_WINDOW_SHOWN;
} }