Merge "Activity Record Splash Screen" (0373c4e6) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/wm/ActivityRecord.java

+7 −3

Original line number	Diff line number	Diff line
		@@ -1875,9 +1875,13 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
		} else if (newTask \|\| !processRunning \|\| (taskSwitch && !activityCreated)) {
		return STARTING_WINDOW_TYPE_SPLASH_SCREEN;
		} else if (taskSwitch && allowTaskSnapshot) {
		return snapshot == null ? STARTING_WINDOW_TYPE_NONE
		: snapshotOrientationSameAsTask(snapshot) \|\| fromRecents
		? STARTING_WINDOW_TYPE_SNAPSHOT : STARTING_WINDOW_TYPE_SPLASH_SCREEN;
		if (snapshotOrientationSameAsTask(snapshot) \|\| (snapshot != null && fromRecents)) {
		return STARTING_WINDOW_TYPE_SNAPSHOT;
		}
		if (!isActivityTypeHome()) {
		return STARTING_WINDOW_TYPE_SPLASH_SCREEN;
		}
		return STARTING_WINDOW_TYPE_NONE;
		} else {
		return STARTING_WINDOW_TYPE_NONE;
		}