Merge "Remove dismiss target only when it's attached to a parent." into tm-qpr-dev (489880bc) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipDismissTargetHandler.java

+3 −10

Original line number	Diff line number	Diff line
		@@ -235,21 +235,14 @@ public class PipDismissTargetHandler implements ViewTreeObserver.OnPreDrawListen

		/** Adds the magnetic target view to the WindowManager so it's ready to be animated in. */
		public void createOrUpdateDismissTarget() {
		if (!mTargetViewContainer.isAttachedToWindow()) {
		if (mTargetViewContainer.getParent() == null) {
		mTargetViewContainer.cancelAnimators();

		mTargetViewContainer.setVisibility(View.INVISIBLE);
		mTargetViewContainer.getViewTreeObserver().removeOnPreDrawListener(this);
		mHasDismissTargetSurface = false;

		try {
		mWindowManager.addView(mTargetViewContainer, getDismissTargetLayoutParams());
		} catch (IllegalStateException e) {
		// This shouldn't happen, but if the target is already added, just update its layout
		// params.
		mWindowManager.updateViewLayout(
		mTargetViewContainer, getDismissTargetLayoutParams());
		}
		} else {
		mWindowManager.updateViewLayout(mTargetViewContainer, getDismissTargetLayoutParams());
		}
		@@ -306,7 +299,7 @@ public class PipDismissTargetHandler implements ViewTreeObserver.OnPreDrawListen
		* Removes the dismiss target and cancels any pending callbacks to show it.
		*/
		public void cleanUpDismissTarget() {
		if (mTargetViewContainer.isAttachedToWindow()) {
		if (mTargetViewContainer.getParent() != null) {
		mWindowManager.removeViewImmediate(mTargetViewContainer);
		}
		}