Merge "Merge "Disable rounded corners when in multi window" into qt-dev am:... (e3947bf1) · Commits · e / os / android_frameworks_base

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

+6 −1

Original line number	Diff line number	Diff line
		@@ -2557,12 +2557,17 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree

		final Animation a = loadAnimation(lp, transit, enter, isVoiceInteraction);
		if (a != null) {
		// Only apply corner radius to animation if we're not in multi window mode.
		// We don't want rounded corners when in pip or split screen.
		final float windowCornerRadius = !inMultiWindowMode()
		? getDisplayContent().getWindowCornerRadius()
		: 0;
		adapter = new LocalAnimationAdapter(
		new WindowAnimationSpec(a, mTmpPoint, mTmpRect,
		getDisplayContent().mAppTransition.canSkipFirstFrame(),
		appStackClipMode,
		true /* isAppAnimation */,
		getDisplayContent().getWindowCornerRadius()),
		windowCornerRadius),
		mWmService.mSurfaceAnimationRunner);
		if (a.getZAdjustment() == Animation.ZORDER_TOP) {
		mNeedsZBoost = true;

+1 −1

Original line number	Diff line number	Diff line
		@@ -4599,7 +4599,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
		anim.scaleCurrentDuration(mWmService.getWindowAnimationScaleLocked());
		final AnimationAdapter adapter = new LocalAnimationAdapter(
		new WindowAnimationSpec(anim, mSurfacePosition, false /* canSkipFirstFrame */,
		getDisplayContent().getWindowCornerRadius()),
		0 /* windowCornerRadius */),
		mWmService.mSurfaceAnimationRunner);
		startAnimation(mPendingTransaction, adapter);
		commitPendingTransaction();