Merge "Allow to show icon style splash screen when launched from Shell." into tm-dev (9b30f9e9) · Commits · e / os / android_frameworks_base

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

+4 −2

Original line number	Diff line number	Diff line
		@@ -6767,7 +6767,8 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
		}
		// Choose the default behavior for Launcher and SystemUI when the SplashScreen style is
		// not specified in the ActivityOptions.
		if (mLaunchSourceType == LAUNCH_SOURCE_TYPE_HOME) {
		if (mLaunchSourceType == LAUNCH_SOURCE_TYPE_HOME
		\|\| launchedFromUid == Process.SHELL_UID) {
		return false;
		} else if (mLaunchSourceType == LAUNCH_SOURCE_TYPE_SYSTEMUI) {
		return true;
		@@ -6787,7 +6788,8 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
		// solid color splash screen.
		// Need to check sourceRecord before in case this activity is launched from service.
		return !startActivity \|\| !(mLaunchSourceType == LAUNCH_SOURCE_TYPE_SYSTEM
		\|\| mLaunchSourceType == LAUNCH_SOURCE_TYPE_HOME);
		\|\| mLaunchSourceType == LAUNCH_SOURCE_TYPE_HOME
		\|\| launchedFromUid == Process.SHELL_UID);
		}

		private int getSplashscreenTheme(ActivityOptions options) {