Merge "Merge "Don't even think about changing keyguard transit" into oc-dev... (cb3b80d3) · Commits · e / os / android_frameworks_base

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

+4 −1

Original line number	Diff line number	Diff line
		@@ -2044,7 +2044,10 @@ public class AppTransition implements Dump {
		if (forceOverride \|\| isKeyguardTransit(transit) \|\| !isTransitionSet()
		\|\| mNextAppTransition == TRANSIT_NONE) {
		setAppTransition(transit, flags);
		} else if (!alwaysKeepCurrent) {
		}
		// We never want to change from a Keyguard transit to a non-Keyguard transit, as our logic
		// relies on the fact that we always execute a Keyguard transition after preparing one.
		else if (!alwaysKeepCurrent && !isKeyguardTransit(transit)) {
		if (transit == TRANSIT_TASK_OPEN && isTransitionEqual(TRANSIT_TASK_CLOSE)) {
		// Opening a new task always supersedes a close for the anim.
		setAppTransition(transit, flags);

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

+40 −34

Original line number	Diff line number	Diff line
		@@ -25,6 +25,7 @@ import static com.android.server.wm.AppTransition.TRANSIT_WALLPAPER_CLOSE;
		import static com.android.server.wm.AppTransition.TRANSIT_WALLPAPER_INTRA_CLOSE;
		import static com.android.server.wm.AppTransition.TRANSIT_WALLPAPER_INTRA_OPEN;
		import static com.android.server.wm.AppTransition.TRANSIT_WALLPAPER_OPEN;
		import static com.android.server.wm.AppTransition.isKeyguardGoingAwayTransit;
		import static com.android.server.wm.WindowManagerDebugConfig.DEBUG;
		import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_APP_TRANSITIONS;
		import static com.android.server.wm.WindowManagerDebugConfig.SHOW_LIGHT_TRANSACTIONS;
		@@ -239,7 +240,7 @@ class WindowSurfacePlacer {

		if (DEBUG_APP_TRANSITIONS) Slog.v(TAG, "**** GOOD TO GO");
		int transit = mService.mAppTransition.getAppTransition();
		if (mService.mSkipAppTransitionAnimation) {
		if (mService.mSkipAppTransitionAnimation && !isKeyguardGoingAwayTransit(transit)) {
		transit = AppTransition.TRANSIT_UNSET;
		}
		mService.mSkipAppTransitionAnimation = false;
		@@ -598,6 +599,14 @@ class WindowSurfacePlacer {
		+ ", openingApps=" + openingApps
		+ ", closingApps=" + closingApps);
		mService.mAnimateWallpaperWithTarget = false;
		if (openingCanBeWallpaperTarget && transit == TRANSIT_KEYGUARD_GOING_AWAY) {
		transit = TRANSIT_KEYGUARD_GOING_AWAY_ON_WALLPAPER;
		if (DEBUG_APP_TRANSITIONS) Slog.v(TAG,
		"New transit: " + AppTransition.appTransitionToString(transit));
		}
		// We never want to change from a Keyguard transit to a non-Keyguard transit, as our logic
		// relies on the fact that we always execute a Keyguard transition after preparing one.
		else if (!isKeyguardGoingAwayTransit(transit)) {
		if (closingAppHasWallpaper && openingAppHasWallpaper) {
		if (DEBUG_APP_TRANSITIONS) Slog.v(TAG, "Wallpaper animation!");
		switch (transit) {
		@@ -614,10 +623,6 @@ class WindowSurfacePlacer {
		}
		if (DEBUG_APP_TRANSITIONS) Slog.v(TAG,
		"New transit: " + AppTransition.appTransitionToString(transit));
		} else if (openingCanBeWallpaperTarget && transit == TRANSIT_KEYGUARD_GOING_AWAY) {
		transit = TRANSIT_KEYGUARD_GOING_AWAY_ON_WALLPAPER;
		if (DEBUG_APP_TRANSITIONS) Slog.v(TAG,
		"New transit: " + AppTransition.appTransitionToString(transit));
		} else if (oldWallpaper != null && !mService.mOpeningApps.isEmpty()
		&& !openingApps.contains(oldWallpaper.mAppToken)
		&& closingApps.contains(oldWallpaper.mAppToken)) {
		@@ -635,6 +640,7 @@ class WindowSurfacePlacer {
		} else {
		mService.mAnimateWallpaperWithTarget = true;
		}
		}
		return transit;
		}