Merge "Don't offset TaskView when it is not in the bounds of parent." into tm-qpr-dev (6c9cd270) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/src/com/android/wm/shell/TaskView.java

+7 −12

Original line number	Diff line number	Diff line
		@@ -224,16 +224,6 @@ public class TaskView extends SurfaceView implements SurfaceHolder.Callback,
		mObscuredTouchRegion = obscuredRegion;
		}

		private void onLocationChanged(WindowContainerTransaction wct) {
		// Update based on the screen bounds
		getBoundsOnScreen(mTmpRect);
		getRootView().getBoundsOnScreen(mTmpRootRect);
		if (!mTmpRootRect.contains(mTmpRect)) {
		mTmpRect.offsetTo(0, 0);
		}
		wct.setBounds(mTaskToken, mTmpRect);
		}

		/**
		* Call when view position or size has changed. Do not call when animating.
		*/
		@@ -246,10 +236,15 @@ public class TaskView extends SurfaceView implements SurfaceHolder.Callback,
		if (isUsingShellTransitions() && mTaskViewTransitions.hasPending()) return;

		WindowContainerTransaction wct = new WindowContainerTransaction();
		onLocationChanged(wct);
		updateWindowBounds(wct);
		mSyncQueue.queue(wct);
		}

		private void updateWindowBounds(WindowContainerTransaction wct) {
		getBoundsOnScreen(mTmpRect);
		wct.setBounds(mTaskToken, mTmpRect);
		}

		/**
		* Release this container if it is initialized.
		*/
		@@ -573,7 +568,7 @@ public class TaskView extends SurfaceView implements SurfaceHolder.Callback,
		.apply();

		// TODO: determine if this is really necessary or not
		onLocationChanged(wct);
		updateWindowBounds(wct);
		} else {
		// The surface has already been destroyed before the task has appeared,
		// so go ahead and hide the task entirely