am 798adeff: Don\'t use transient states for wallpaper animation. (deba7bb0) · Commits · e / os / android_frameworks_base

services/java/com/android/server/wm/WindowAnimator.java

+0 −6

Original line number	Original line	Diff line number	Diff line
	@@ -121,12 +121,6 @@ public class WindowAnimator {
	mDisplayContentsAnimators.delete(displayId);		mDisplayContentsAnimators.delete(displayId);
	}		}

	AppWindowAnimator getWallpaperAppAnimator() {
	return mService.mWallpaperTarget == null
	? null : mService.mWallpaperTarget.mAppToken == null
	? null : mService.mWallpaperTarget.mAppToken.mAppAnimator;
	}

	void hideWallpapersLocked(final WindowState w) {		void hideWallpapersLocked(final WindowState w) {
	final WindowState wallpaperTarget = mService.mWallpaperTarget;		final WindowState wallpaperTarget = mService.mWallpaperTarget;
	final WindowState lowerWallpaperTarget = mService.mLowerWallpaperTarget;		final WindowState lowerWallpaperTarget = mService.mLowerWallpaperTarget;

services/java/com/android/server/wm/WindowManagerService.java

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -530,6 +530,7 @@ public class WindowManagerService extends IWindowManager.Stub
	static final long WALLPAPER_TIMEOUT = 150;		static final long WALLPAPER_TIMEOUT = 150;
	// Time we wait after a timeout before trying to wait again.		// Time we wait after a timeout before trying to wait again.
	static final long WALLPAPER_TIMEOUT_RECOVERY = 10000;		static final long WALLPAPER_TIMEOUT_RECOVERY = 10000;
			boolean mAnimateWallpaperWithTarget;

	AppWindowToken mFocusedApp = null;		AppWindowToken mFocusedApp = null;

	@@ -8490,6 +8491,7 @@ public class WindowManagerService extends IWindowManager.Stub
	}		}
	}		}

			mAnimateWallpaperWithTarget = false;
	if (closingAppHasWallpaper && openingAppHasWallpaper) {		if (closingAppHasWallpaper && openingAppHasWallpaper) {
	if (DEBUG_APP_TRANSITIONS) Slog.v(TAG, "Wallpaper animation!");		if (DEBUG_APP_TRANSITIONS) Slog.v(TAG, "Wallpaper animation!");
	switch (transit) {		switch (transit) {
	@@ -8517,6 +8519,8 @@ public class WindowManagerService extends IWindowManager.Stub
	transit = AppTransition.TRANSIT_WALLPAPER_OPEN;		transit = AppTransition.TRANSIT_WALLPAPER_OPEN;
	if (DEBUG_APP_TRANSITIONS) Slog.v(TAG,		if (DEBUG_APP_TRANSITIONS) Slog.v(TAG,
	"New transit into wallpaper: " + transit);		"New transit into wallpaper: " + transit);
			} else {
			mAnimateWallpaperWithTarget = true;
	}		}

	// If all closing windows are obscured, then there is		// If all closing windows are obscured, then there is

services/java/com/android/server/wm/WindowStateAnimator.java

+6 −5

Original line number	Original line	Diff line number	Diff line
	@@ -845,9 +845,9 @@ class WindowStateAnimator {

	// Wallpapers are animated based on the "real" window they		// Wallpapers are animated based on the "real" window they
	// are currently targeting.		// are currently targeting.
	if (mIsWallpaper && mService.mLowerWallpaperTarget == null		final WindowState wallpaperTarget = mService.mWallpaperTarget;
	&& mService.mWallpaperTarget != null) {		if (mIsWallpaper && wallpaperTarget != null && mService.mAnimateWallpaperWithTarget) {
	final WindowStateAnimator wallpaperAnimator = mService.mWallpaperTarget.mWinAnimator;		final WindowStateAnimator wallpaperAnimator = wallpaperTarget.mWinAnimator;
	if (wallpaperAnimator.mHasLocalTransformation &&		if (wallpaperAnimator.mHasLocalTransformation &&
	wallpaperAnimator.mAnimation != null &&		wallpaperAnimator.mAnimation != null &&
	!wallpaperAnimator.mAnimation.getDetachWallpaper()) {		!wallpaperAnimator.mAnimation.getDetachWallpaper()) {
	@@ -856,7 +856,8 @@ class WindowStateAnimator {
	Slog.v(TAG, "WP target attached xform: " + attachedTransformation);		Slog.v(TAG, "WP target attached xform: " + attachedTransformation);
	}		}
	}		}
	final AppWindowAnimator wpAppAnimator = mAnimator.getWallpaperAppAnimator();		final AppWindowAnimator wpAppAnimator = wallpaperTarget.mAppToken == null ?
			null : wallpaperTarget.mAppToken.mAppAnimator;
	if (wpAppAnimator != null && wpAppAnimator.hasTransformation		if (wpAppAnimator != null && wpAppAnimator.hasTransformation
	&& wpAppAnimator.animation != null		&& wpAppAnimator.animation != null
	&& !wpAppAnimator.animation.getDetachWallpaper()) {		&& !wpAppAnimator.animation.getDetachWallpaper()) {