Merge "Use self's pendingTransaction object when setting position." (fbcdae06) · Commits · e / os / android_frameworks_base

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

+2 −6

Original line number	Diff line number	Diff line
		@@ -736,15 +736,11 @@ public class TaskStack extends WindowContainer<Task> implements
		}

		private void updateSurfaceBounds() {
		updateSurfaceBounds(getPendingTransaction());
		updateSurfaceSize(getPendingTransaction());
		updateSurfacePosition();
		scheduleAnimation();
		}

		void updateSurfaceBounds(SurfaceControl.Transaction transaction) {
		updateSurfaceSize(transaction);
		updateSurfacePosition(transaction);
		}

		private void updateSurfaceSize(SurfaceControl.Transaction transaction) {
		if (mSurfaceControl == null) {
		return;

+3 −7

Original line number	Diff line number	Diff line
		@@ -131,7 +131,7 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer<
		@Override
		public void onConfigurationChanged(Configuration newParentConfig) {
		super.onConfigurationChanged(newParentConfig);
		updateSurfacePosition(getPendingTransaction());
		updateSurfacePosition();
		scheduleAnimation();
		}

		@@ -1204,7 +1204,7 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer<
		}
		}

		void updateSurfacePosition(SurfaceControl.Transaction transaction) {
		void updateSurfacePosition() {
		if (mSurfaceControl == null) {
		return;
		}
		@@ -1214,12 +1214,8 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer<
		return;
		}

		transaction.setPosition(mSurfaceControl, mTmpPos.x, mTmpPos.y);
		getPendingTransaction().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);
		}
		}

		void getRelativePosition(Point outPos) {

+6 −2

Original line number	Diff line number	Diff line
		@@ -4519,7 +4519,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
		if (dimmer != null) {
		applyDims(dimmer);
		}
		updateSurfacePosition(mPendingTransaction);
		updateSurfacePosition();

		mWinAnimator.prepareSurfaceLocked(true);
		super.prepareSurfaces();
		@@ -4541,7 +4541,11 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
		}

		@Override
		void updateSurfacePosition(Transaction t) {
		void updateSurfacePosition() {
		updateSurfacePosition(getPendingTransaction());
		}

		private void updateSurfacePosition(Transaction t) {
		if (mSurfaceControl == null) {
		return;
		}