Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix some visibility issues with tasks & task overlays" into tm-qpr-dev

Browse Source
This commit is contained in:
Winson Chung
2023-01-20 05:01:18 +00:00
committed by Android (Google) Code Review
parent fd0d46e023 08da091ac7
commit 3dcd9ed244
3 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

7
services/core/java/com/android/server/wm/Task.java
View File

@@ -3327,12 +3327,17 @@ class Task extends TaskFragment {
// We intend to let organizer manage task visibility but it doesn't // We intend to let organizer manage task visibility but it doesn't
// have enough information until we finish shell transitions. // have enough information until we finish shell transitions.
// In the mean time we do an easy fix here. // 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 (mSurfaceControl != null) {
if (show != mLastSurfaceShowing) { if (show != mLastSurfaceShowing) {
t.setVisibility(mSurfaceControl, show); t.setVisibility(mSurfaceControl, show);
} }
} }
// Only show the overlay if the task has other visible children
if (mOverlayHost != null) {
mOverlayHost.setVisibility(t, visible);
}
mLastSurfaceShowing = show; mLastSurfaceShowing = show;
} }

6
services/core/java/com/android/server/wm/TrustedOverlayHost.java
View File

@@ -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) { void addOverlay(SurfaceControlViewHost.SurfacePackage p, SurfaceControl currentParent) {
requireOverlaySurfaceControl(); requireOverlaySurfaceControl();
mOverlays.add(p); mOverlays.add(p);