Merge "Fixing transition to/from Recents with full screen apps." (53dd1f7f) · Commits · e / os / android_frameworks_base

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

+21 −4

Original line number	Diff line number	Diff line
		@@ -26,6 +26,7 @@ import android.os.Handler;
		import android.os.IRemoteCallback;
		import android.os.SystemProperties;
		import android.util.Slog;
		import android.view.View;
		import android.view.WindowManager;
		import android.view.animation.AlphaAnimation;
		import android.view.animation.Animation;
		@@ -34,7 +35,6 @@ import android.view.animation.AnimationUtils;
		import android.view.animation.ClipRectAnimation;
		import android.view.animation.Interpolator;
		import android.view.animation.ScaleAnimation;

		import android.view.animation.TranslateAnimation;
		import com.android.internal.util.DumpUtils.Dump;
		import com.android.server.AttributeCache;
		@@ -500,7 +500,8 @@ public class AppTransition implements Dump {
		*/
		Animation createAlternateThumbnailEnterExitAnimationLocked(int thumbTransitState, int appWidth,
		int appHeight, int orientation, int transit,
		Rect containingFrame, Rect contentInsets) {
		Rect containingFrame, Rect contentInsets,
		boolean isFullScreen) {
		Animation a;
		final int thumbWidthI = mNextAppTransitionThumbnail.getWidth();
		final float thumbWidth = thumbWidthI > 0 ? thumbWidthI : 1;
		@@ -520,6 +521,9 @@ public class AppTransition implements Dump {
		scaledTopDecor = (int) (scale * contentInsets.top);
		int unscaledThumbHeight = (int) (thumbHeight / scale);
		mTmpFromClipRect.set(containingFrame);
		if (isFullScreen) {
		mTmpFromClipRect.top = contentInsets.top;
		}
		mTmpFromClipRect.bottom = (mTmpFromClipRect.top + unscaledThumbHeight);
		mTmpToClipRect.set(containingFrame);
		} else {
		@@ -527,7 +531,12 @@ public class AppTransition implements Dump {
		scale = thumbHeight / (appHeight - contentInsets.top);
		scaledTopDecor = (int) (scale * contentInsets.top);
		int unscaledThumbWidth = (int) (thumbWidth / scale);
		int unscaledThumbHeight = (int) (thumbHeight / scale);
		mTmpFromClipRect.set(containingFrame);
		if (isFullScreen) {
		mTmpFromClipRect.top = contentInsets.top;
		mTmpFromClipRect.bottom = (mTmpFromClipRect.top + unscaledThumbHeight);
		}
		mTmpFromClipRect.right = (mTmpFromClipRect.left + unscaledThumbWidth);
		mTmpToClipRect.set(containingFrame);
		}
		@@ -575,14 +584,22 @@ public class AppTransition implements Dump {
		int unscaledThumbHeight = (int) (thumbHeight / scale);
		mTmpFromClipRect.set(containingFrame);
		mTmpToClipRect.set(containingFrame);
		if (isFullScreen) {
		mTmpToClipRect.top = contentInsets.top;
		}
		mTmpToClipRect.bottom = (mTmpToClipRect.top + unscaledThumbHeight);
		} else {
		// In landscape, we scale the height and clip to the top/left square
		scale = thumbHeight / (appHeight - contentInsets.top);
		scaledTopDecor = (int) (scale * contentInsets.top);
		int unscaledThumbWidth = (int) (thumbWidth / scale);
		int unscaledThumbHeight = (int) (thumbHeight / scale);
		mTmpFromClipRect.set(containingFrame);
		mTmpToClipRect.set(containingFrame);
		if (isFullScreen) {
		mTmpToClipRect.top = contentInsets.top;
		mTmpToClipRect.bottom = (mTmpToClipRect.top + unscaledThumbHeight);
		}
		mTmpToClipRect.right = (mTmpToClipRect.left + unscaledThumbWidth);
		}

		@@ -679,7 +696,7 @@ public class AppTransition implements Dump {

		Animation loadAnimation(WindowManager.LayoutParams lp, int transit, boolean enter,
		int appWidth, int appHeight, int orientation,
		Rect containingFrame, Rect contentInsets) {
		Rect containingFrame, Rect contentInsets, boolean isFullScreen) {
		Animation a;
		if (mNextAppTransitionType == NEXT_TRANSIT_TYPE_CUSTOM) {
		a = loadAnimation(mNextAppTransitionPackage, enter ?
		@@ -702,7 +719,7 @@ public class AppTransition implements Dump {
		(mNextAppTransitionType == NEXT_TRANSIT_TYPE_THUMBNAIL_SCALE_UP);
		a = createAlternateThumbnailEnterExitAnimationLocked(
		getThumbnailTransitionState(enter), appWidth, appHeight, orientation,
		transit, containingFrame, contentInsets);
		transit, containingFrame, contentInsets, isFullScreen);
		if (DEBUG_APP_TRANSITIONS \|\| DEBUG_ANIM) {
		String animName = mNextAppTransitionScaleUp ?
		"ANIM_THUMBNAIL_SCALE_UP" : "ANIM_THUMBNAIL_SCALE_DOWN";

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

+9 −1

Original line number	Diff line number	Diff line
		@@ -289,6 +289,11 @@ public class WindowManagerService extends IWindowManager.Stub

		private static final int MAX_SCREENSHOT_RETRIES = 3;

		// The flag describing a full screen app window (where the app takes care of drawing under the
		// SystemUI bars)
		private static final int SYSTEM_UI_FLAGS_LAYOUT_STABLE_FULLSCREEN =
		View.SYSTEM_UI_FLAG_LAYOUT_STABLE \| View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN;

		final private KeyguardDisableHandler mKeyguardDisableHandler;

		final BroadcastReceiver mBroadcastReceiver = new BroadcastReceiver() {
		@@ -3193,8 +3198,11 @@ public class WindowManagerService extends IWindowManager.Stub
		}
		}

		boolean isFullScreen =
		((win.mSystemUiVisibility & SYSTEM_UI_FLAGS_LAYOUT_STABLE_FULLSCREEN)
		== SYSTEM_UI_FLAGS_LAYOUT_STABLE_FULLSCREEN);
		Animation a = mAppTransition.loadAnimation(lp, transit, enter, width, height,
		mCurConfiguration.orientation, containingFrame, contentInsets);
		mCurConfiguration.orientation, containingFrame, contentInsets, isFullScreen);
		if (a != null) {
		if (DEBUG_ANIM) {
		RuntimeException e = null;