Merge "Revert "Avoid setting size/position on Transaction if not needed"" (4ea33ae8) · Commits · e / os / android_frameworks_base

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

+1 −9

Original line number	Diff line number	Diff line
		@@ -44,7 +44,6 @@ import static com.android.server.wm.proto.StackProto.WINDOW_CONTAINER;

		import android.annotation.CallSuper;
		import android.content.res.Configuration;
		import android.graphics.Point;
		import android.graphics.Rect;
		import android.graphics.Region;
		import android.os.RemoteException;
		@@ -146,7 +145,6 @@ public class TaskStack extends WindowContainer<Task> implements
		* For {@link #prepareSurfaces}.
		*/
		final Rect mTmpDimBoundsRect = new Rect();
		private final Point mLastSurfaceSize = new Point();

		TaskStack(WindowManagerService service, int stackId, StackWindowController controller) {
		super(service);
		@@ -745,13 +743,7 @@ public class TaskStack extends WindowContainer<Task> implements
		}

		final Rect stackBounds = getBounds();
		final int width = stackBounds.width();
		final int height = stackBounds.height();
		if (width == mLastSurfaceSize.x && height == mLastSurfaceSize.y) {
		return;
		}
		transaction.setSize(mSurfaceControl, width, height);
		mLastSurfaceSize.set(width, height);
		transaction.setSize(mSurfaceControl, stackBounds.width(), stackBounds.height());
		}

		@Override

+0 −6

Original line number	Diff line number	Diff line
		@@ -95,7 +95,6 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer<
		protected final WindowManagerService mService;

		private final Point mTmpPos = new Point();
		protected final Point mLastSurfacePosition = new Point();

		/** Total number of elements in this subtree, including our own hierarchy element. */
		private int mTreeWeight = 1;
		@@ -1178,12 +1177,7 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer<
		}

		getRelativePosition(mTmpPos);
		if (mTmpPos.equals(mLastSurfacePosition)) {
		return;
		}

		transaction.setPosition(mSurfaceControl, mTmpPos.x, mTmpPos.y);
		mLastSurfacePosition.set(mTmpPos.x, mTmpPos.y);

		for (int i = mChildren.size() - 1; i >= 0; i--) {
		mChildren.get(i).updateSurfacePosition(transaction);

+1 −3

Original line number	Diff line number	Diff line
		@@ -4484,7 +4484,6 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP

		// Leash is now responsible for position, so set our position to 0.
		t.setPosition(mSurfaceControl, 0, 0);
		mLastSurfacePosition.set(0, 0);
		}

		@Override
		@@ -4500,9 +4499,8 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
		}

		transformFrameToSurfacePosition(mFrame.left, mFrame.top, mSurfacePosition);
		if (!mSurfaceAnimator.hasLeash() && !mLastSurfacePosition.equals(mSurfacePosition)) {
		if (!mSurfaceAnimator.hasLeash()) {
		t.setPosition(mSurfaceControl, mSurfacePosition.x, mSurfacePosition.y);
		mLastSurfacePosition.set(mSurfacePosition.x, mSurfacePosition.y);
		}
		}