Merge "Don't specify stack bounds for unsizeable home stack in dock mode" into oc-dev

am: f4472b6507

Change-Id: I2507216075b544eed6b9de4cea0f28e80c5c28d4
This commit is contained in:
Wale Ogunwale
2017-04-25 04:31:17 +00:00
committed by android-build-merger

View File

@@ -733,10 +733,17 @@ public class TaskStack extends WindowContainer<Task> implements DimLayer.DimLaye
outTempTaskBounds.setEmpty(); outTempTaskBounds.setEmpty();
// When the home stack is resizable, should always have the same stack and task bounds // When the home stack is resizable, should always have the same stack and task bounds
if (mStackId == HOME_STACK_ID && findHomeTask().isResizeable()) { if (mStackId == HOME_STACK_ID) {
// Calculate the home stack bounds when in docked mode if (findHomeTask().isResizeable()) {
getDisplayContent().mDividerControllerLocked // Calculate the home stack bounds when in docked mode and the home stack is
.getHomeStackBoundsInDockedMode(outStackBounds); // resizeable.
getDisplayContent().mDividerControllerLocked
.getHomeStackBoundsInDockedMode(outStackBounds);
} else {
// Home stack isn't resizeable, so don't specify stack bounds.
outStackBounds.setEmpty();
}
outTempTaskBounds.set(outStackBounds); outTempTaskBounds.set(outStackBounds);
return; return;
} }