Merge "Extract AppTransition from WindowManager" (8f0bdb5b) · Commits · e / os / android_frameworks_base

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

0 → 100644

+629 −0

File added.

Preview size limit exceeded, changes collapsed.

+2 −2

Original line number	Diff line number	Diff line
		@@ -58,12 +58,12 @@ public class AppWindowAnimator {
		mAnimator = atoken.mAnimator;
		}

		public void setAnimation(Animation anim, boolean initialized) {
		public void setAnimation(Animation anim) {
		if (WindowManagerService.localLOGV) Slog.v(
		TAG, "Setting animation in " + mAppToken + ": " + anim);
		animation = anim;
		animating = false;
		animInitialized = initialized;
		animInitialized = anim.isInitialized();
		anim.restrictDuration(WindowManagerService.MAX_ANIMATION_DURATION);
		anim.scaleCurrentDuration(mService.mTransitionAnimationScale);
		int zorder = anim.getZAdjustment();

+84 −550

File changed.

Preview size limit exceeded, changes collapsed.

+8 −9

Original line number	Diff line number	Diff line
		@@ -677,7 +677,7 @@ final class WindowState implements WindowManagerPolicy.WindowState {
		@Override
		public boolean isVisibleOrBehindKeyguardLw() {
		if (mRootToken.waitingToShow &&
		mService.mNextAppTransition != WindowManagerPolicy.TRANSIT_UNSET) {
		mService.mAppTransition.isTransitionSet()) {
		return false;
		}
		final AppWindowToken atoken = mAppToken;
		@@ -756,7 +756,7 @@ final class WindowState implements WindowManagerPolicy.WindowState {
		*/
		boolean isReadyForDisplay() {
		if (mRootToken.waitingToShow &&
		mService.mNextAppTransition != WindowManagerPolicy.TRANSIT_UNSET) {
		mService.mAppTransition.isTransitionSet()) {
		return false;
		}
		return mHasSurface && mPolicyVisibility && !mDestroying
		@@ -771,8 +771,7 @@ final class WindowState implements WindowManagerPolicy.WindowState {
		* to the keyguard.
		*/
		boolean isReadyForDisplayIgnoringKeyguard() {
		if (mRootToken.waitingToShow &&
		mService.mNextAppTransition != WindowManagerPolicy.TRANSIT_UNSET) {
		if (mRootToken.waitingToShow && mService.mAppTransition.isTransitionSet()) {
		return false;
		}
		final AppWindowToken atoken = mAppToken;

+1 −1

Original line number	Diff line number	Diff line
		@@ -1540,7 +1540,7 @@ class WindowStateAnimator {
		break;
		}
		if (attr >= 0) {
		a = mService.loadAnimation(mWin.mAttrs, attr);
		a = mService.mAppTransition.loadAnimation(mWin.mAttrs, attr);
		}
		}
		if (WindowManagerService.DEBUG_ANIM) Slog.v(TAG,