Fix checking crop region for home/recents

Wasn't handling split-screen properly. Now it checks if the
home/recents is the top of its "visibility" stack vs top
of root-task. This means it must be the top sibling in either
the displayarea or the root-split. This check is necessary
for dealing with visible windows that are behind a translucent
task.

Bug: 159138687
Test: Enter split with 2 apps, close the top app, return to home
      and verify that it receives touches in top half
Change-Id: Ie6fed2dd945952b83116721a98fc6d7c8396729f
This commit is contained in:
Evan Rosky
2020-06-16 14:50:09 -07:00
parent faf50e11cb
commit 38e9b2141d
2 changed files with 12 additions and 3 deletions

View File

@@ -2927,9 +2927,17 @@ class Task extends WindowContainer<WindowContainer> {
// Don't crop HOME/RECENTS windows to stack bounds. This is because in split-screen
// they extend past their stack and sysui uses the stack surface to control cropping.
// TODO(b/158242495): get rid of this when drag/drop can use surface bounds.
final boolean isTopHomeOrRecents = (isActivityTypeHome() || isActivityTypeRecents())
&& getRootTask().getTopMostTask() == this;
return isResizeable() && !isTopHomeOrRecents;
if (isActivityTypeHome() || isActivityTypeRecents()) {
// Make sure this is the top-most non-organizer root task (if not top-most, it means
// another translucent task could be above this, so this needs to stay cropped.
final Task rootTask = getRootTask();
final Task topNonOrgTask =
rootTask.mCreatedByOrganizer ? rootTask.getTopMostTask() : rootTask;
if (isDescendantOf(topNonOrgTask)) {
return false;
}
}
return isResizeable();
}
/**

View File

@@ -3412,6 +3412,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
private void setTouchableRegionCropIfNeeded(InputWindowHandle handle) {
final Task task = getTask();
if (task == null || !task.cropWindowsToStackBounds()) {
handle.setTouchableRegionCrop(null);
return;
}