Merge "Force windows to be scalable during pinned animation." into nyc-dev (e9e87a80) · Commits · e / os / android_frameworks_base

core/java/android/view/Surface.java

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -102,13 +102,13 @@ public class Surface implements Parcelable {
	public @interface ScalingMode {}		public @interface ScalingMode {}
	// From system/window.h		// From system/window.h
	/** @hide */		/** @hide */
	static final int SCALING_MODE_FREEZE = 0;		public static final int SCALING_MODE_FREEZE = 0;
	/** @hide */		/** @hide */
	static final int SCALING_MODE_SCALE_TO_WINDOW = 1;		public static final int SCALING_MODE_SCALE_TO_WINDOW = 1;
	/** @hide */		/** @hide */
	static final int SCALING_MODE_SCALE_CROP = 2;		public static final int SCALING_MODE_SCALE_CROP = 2;
	/** @hide */		/** @hide */
	static final int SCALING_MODE_NO_SCALE_CROP = 3;		public static final int SCALING_MODE_NO_SCALE_CROP = 3;

	/** @hide */		/** @hide */
	@IntDef({ROTATION_0, ROTATION_90, ROTATION_180, ROTATION_270})		@IntDef({ROTATION_0, ROTATION_90, ROTATION_180, ROTATION_270})

+7 −0

Original line number	Original line	Diff line number	Diff line
	@@ -85,6 +85,8 @@ public class SurfaceControl {
	IBinder displayToken, int mode);		IBinder displayToken, int mode);
	private static native void nativeDeferTransactionUntil(long nativeObject,		private static native void nativeDeferTransactionUntil(long nativeObject,
	IBinder handle, long frame);		IBinder handle, long frame);
			private static native void nativeSetOverrideScalingMode(long nativeObject,
			int scalingMode);
	private static native IBinder nativeGetHandle(long nativeObject);		private static native IBinder nativeGetHandle(long nativeObject);


	@@ -376,6 +378,11 @@ public class SurfaceControl {
	nativeDeferTransactionUntil(mNativeObject, handle, frame);		nativeDeferTransactionUntil(mNativeObject, handle, frame);
	}		}

			public void setOverrideScalingMode(int scalingMode) {
			checkNotReleased();
			nativeSetOverrideScalingMode(mNativeObject, scalingMode);
			}

	public IBinder getHandle() {		public IBinder getHandle() {
	return nativeGetHandle(mNativeObject);		return nativeGetHandle(mNativeObject);
	}		}

+9 −0

Original line number	Original line	Diff line number	Diff line
	@@ -597,6 +597,13 @@ static void nativeDeferTransactionUntil(JNIEnv* env, jclass clazz, jlong nativeO
	ctrl->deferTransactionUntil(handle, frameNumber);		ctrl->deferTransactionUntil(handle, frameNumber);
	}		}

			static void nativeSetOverrideScalingMode(JNIEnv* env, jclass clazz, jlong nativeObject,
			jint scalingMode) {
			auto ctrl = reinterpret_cast<SurfaceControl *>(nativeObject);

			ctrl->setOverrideScalingMode(scalingMode);
			}

	static jobject nativeGetHandle(JNIEnv* env, jclass clazz, jlong nativeObject) {		static jobject nativeGetHandle(JNIEnv* env, jclass clazz, jlong nativeObject) {
	auto ctrl = reinterpret_cast<SurfaceControl *>(nativeObject);		auto ctrl = reinterpret_cast<SurfaceControl *>(nativeObject);

	@@ -676,6 +683,8 @@ static const JNINativeMethod sSurfaceControlMethods[] = {
	(void*)nativeSetDisplayPowerMode },		(void*)nativeSetDisplayPowerMode },
	{"nativeDeferTransactionUntil", "(JLandroid/os/IBinder;J)V",		{"nativeDeferTransactionUntil", "(JLandroid/os/IBinder;J)V",
	(void*)nativeDeferTransactionUntil },		(void*)nativeDeferTransactionUntil },
			{"nativeSetOverrideScalingMode", "(JI)V",
			(void*)nativeSetOverrideScalingMode },
	{"nativeGetHandle", "(J)Landroid/os/IBinder;",		{"nativeGetHandle", "(J)Landroid/os/IBinder;",
	(void*)nativeGetHandle }		(void*)nativeGetHandle }
	};		};

+7 −4

Original line number	Original line	Diff line number	Diff line
	@@ -129,13 +129,16 @@ public class BoundsAnimationController {
	public void onAnimationStart(Animator animation) {		public void onAnimationStart(Animator animation) {
	if (DEBUG) Slog.d(TAG, "onAnimationStart: mTarget=" + mTarget		if (DEBUG) Slog.d(TAG, "onAnimationStart: mTarget=" + mTarget
	+ " mReplacement=" + mReplacement);		+ " mReplacement=" + mReplacement);
	if (animatingToLargerSize()) {
	mTarget.setPinnedStackSize(mFrom, mTo);
	}

	if (!mReplacement) {		if (!mReplacement) {
	mTarget.onAnimationStart();		mTarget.onAnimationStart();
	}		}

			// Ensure that we have prepared the target for animation before
			// we trigger any size changes, so it can swap surfaces
			// in to appropriate modes, or do as it wishes otherwise.
			if (animatingToLargerSize()) {
			mTarget.setPinnedStackSize(mFrom, mTo);
			}
	}		}

	@Override		@Override

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -600,7 +600,8 @@ class Task implements DimLayer.DimLayerUser {
	//		//
	// Anyway we don't need to synchronize position and content updates for these		// Anyway we don't need to synchronize position and content updates for these
	// windows since they aren't at the base layer and could be moved around anyway.		// windows since they aren't at the base layer and could be moved around anyway.
	if (!win.computeDragResizing() && win.mAttrs.type == TYPE_BASE_APPLICATION) {		if (!win.computeDragResizing() && win.mAttrs.type == TYPE_BASE_APPLICATION &&
			!mStack.getBoundsAnimating()) {
	win.mResizedWhileNotDragResizing = true;		win.mResizedWhileNotDragResizing = true;
	}		}
	}		}