Merge "Fix some visibility issues with tasks & task overlays" into tm-qpr-dev (3dcd9ed2) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/src/com/android/wm/shell/fullscreen/FullscreenTaskListener.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -114,7 +114,9 @@ public class FullscreenTaskListener implements ShellTaskOrganizer.TaskListener {
		t.setPosition(leash, positionInParent.x, positionInParent.y);
		t.setAlpha(leash, 1f);
		t.setMatrix(leash, 1, 0, 0, 1);
		if (taskInfo.isVisible) {
		t.show(leash);
		}
		});
		}
		}

+6 −1

Original line number	Diff line number	Diff line
		@@ -3327,12 +3327,17 @@ class Task extends TaskFragment {
		// We intend to let organizer manage task visibility but it doesn't
		// have enough information until we finish shell transitions.
		// In the mean time we do an easy fix here.
		final boolean show = isVisible() \|\| isAnimating(TRANSITION \| PARENTS \| CHILDREN);
		final boolean visible = isVisible();
		final boolean show = visible \|\| isAnimating(TRANSITION \| PARENTS \| CHILDREN);
		if (mSurfaceControl != null) {
		if (show != mLastSurfaceShowing) {
		t.setVisibility(mSurfaceControl, show);
		}
		}
		// Only show the overlay if the task has other visible children
		if (mOverlayHost != null) {
		mOverlayHost.setVisibility(t, visible);
		}
		mLastSurfaceShowing = show;
		}

+6 −0

Original line number	Diff line number	Diff line
		@@ -80,6 +80,12 @@ class TrustedOverlayHost {
		}
		}

		void setVisibility(SurfaceControl.Transaction t, boolean visible) {
		if (mSurfaceControl != null) {
		t.setVisibility(mSurfaceControl, visible);
		}
		}

		void addOverlay(SurfaceControlViewHost.SurfacePackage p, SurfaceControl currentParent) {
		requireOverlaySurfaceControl();
		mOverlays.add(p);