Merge "Account for scaling effects when cropping" into lmp-dev (980d4663) · Commits · e / os / android_frameworks_base

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

+28 −5

Original line number	Diff line number	Diff line
		@@ -524,6 +524,7 @@ class WindowStateAnimator {
		private boolean mShown = false;
		private int mLayerStack;
		private boolean mIsOpaque;
		private float mDsdx, mDtdx, mDsdy, mDtdy;
		private final String mName;

		public SurfaceTrace(SurfaceSession s,
		@@ -618,6 +619,19 @@ class WindowStateAnimator {
		super.setOpaque(isOpaque);
		}

		@Override
		public void setMatrix(float dsdx, float dtdx, float dsdy, float dtdy) {
		if (dsdx != mDsdx \|\| dtdx != mDtdx \|\| dsdy != mDsdy \|\| dtdy != mDtdy) {
		Slog.v(SURFACE_TAG, "setMatrix(" + dsdx + "," + dtdx + "," + dsdy + "," + dtdy +
		"): OLD:" + this + ". Called by " + Debug.getCallers(3));
		mDsdx = dsdx;
		mDtdx = dtdx;
		mDsdy = dsdy;
		mDtdy = dtdy;
		}
		super.setMatrix(dsdx, dtdx, dsdy, dtdy);
		}

		@Override
		public void hide() {
		if (mShown) {
		@@ -665,7 +679,8 @@ class WindowStateAnimator {
		+ " alpha=" + mSurfaceTraceAlpha + " " + mPosition.x + "," + mPosition.y
		+ " " + mSize.x + "x" + mSize.y
		+ " crop=" + mWindowCrop.toShortString()
		+ " opaque=" + mIsOpaque;
		+ " opaque=" + mIsOpaque
		+ " (" + mDsdx + "," + mDtdx + "," + mDsdy + "," + mDtdy + ")";
		}
		}

		@@ -1068,6 +1083,14 @@ class WindowStateAnimator {
		mShownAlpha *= appTransformation.getAlpha();
		if (appTransformation.hasClipRect()) {
		mClipRect.set(appTransformation.getClipRect());
		if (mWin.mHScale > 0) {
		mClipRect.left /= mWin.mHScale;
		mClipRect.right /= mWin.mHScale;
		}
		if (mWin.mVScale > 0) {
		mClipRect.top /= mWin.mVScale;
		mClipRect.bottom /= mWin.mVScale;
		}
		mHasClipRect = true;
		}
		}
		@@ -1418,10 +1441,10 @@ class WindowStateAnimator {
		w.mLastVScale = w.mVScale;
		if (WindowManagerService.SHOW_TRANSACTIONS) WindowManagerService.logSurface(w,
		"alpha=" + mShownAlpha + " layer=" + mAnimLayer
		+ " matrix=[" + (mDsDx*w.mHScale)
		+ "," + (mDtDx*w.mVScale)
		+ "][" + (mDsDy*w.mHScale)
		+ "," + (mDtDy*w.mVScale) + "]", null);
		+ " matrix=[" + mDsDx + "*" + w.mHScale
		+ "," + mDtDx + "*" + w.mVScale
		+ "][" + mDsDy + "*" + w.mHScale
		+ "," + mDtDy + "*" + w.mVScale + "]", null);
		if (mSurfaceControl != null) {
		try {
		mSurfaceAlpha = mShownAlpha;