diff options
| -rw-r--r-- | services/core/java/com/android/server/wm/DisplayContent.java | 4 | ||||
| -rw-r--r-- | services/core/java/com/android/server/wm/TaskStack.java | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java index 91cad469289a..eda8fec7ab39 100644 --- a/services/core/java/com/android/server/wm/DisplayContent.java +++ b/services/core/java/com/android/server/wm/DisplayContent.java @@ -1766,8 +1766,8 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo updateBounds(); } - void getContentRect(Rect out) { - out.set(mDisplayFrames.mContent); + void getStableRect(Rect out) { + out.set(mDisplayFrames.mStable); } TaskStack createStack(int stackId, boolean onTop, StackWindowController controller) { diff --git a/services/core/java/com/android/server/wm/TaskStack.java b/services/core/java/com/android/server/wm/TaskStack.java index 832d3957ef1b..28b1390d92de 100644 --- a/services/core/java/com/android/server/wm/TaskStack.java +++ b/services/core/java/com/android/server/wm/TaskStack.java @@ -1114,12 +1114,12 @@ public class TaskStack extends WindowContainer<Task> implements return false; } - final Rect displayContentRect = mTmpRect; + final Rect displayStableRect = mTmpRect; final Rect contentBounds = mTmpRect2; // Calculate the content bounds excluding the area occupied by IME - getDisplayContent().getContentRect(displayContentRect); - contentBounds.set(displayContentRect); + getDisplayContent().getStableRect(displayStableRect); + contentBounds.set(displayStableRect); int imeTop = Math.max(imeWin.getFrameLw().top, contentBounds.top); imeTop += imeWin.getGivenContentInsetsLw().top; @@ -1127,7 +1127,7 @@ public class TaskStack extends WindowContainer<Task> implements contentBounds.bottom = imeTop; } - final int yOffset = displayContentRect.bottom - contentBounds.bottom; + final int yOffset = displayStableRect.bottom - contentBounds.bottom; final int dividerWidth = getDisplayContent().mDividerControllerLocked.getContentWidth(); @@ -1139,7 +1139,7 @@ public class TaskStack extends WindowContainer<Task> implements // occluded by IME. We shift its bottom up by the height of the IME, but // leaves at least 30% of the top stack visible. final int minTopStackBottom = - getMinTopStackBottom(displayContentRect, getRawBounds().bottom); + getMinTopStackBottom(displayStableRect, getRawBounds().bottom); final int bottom = Math.max( getRawBounds().bottom - yOffset + dividerWidth - dividerWidthInactive, minTopStackBottom); @@ -1159,7 +1159,7 @@ public class TaskStack extends WindowContainer<Task> implements final int topBeforeImeAdjust = getRawBounds().top - dividerWidth + dividerWidthInactive; final int minTopStackBottom = - getMinTopStackBottom(displayContentRect, + getMinTopStackBottom(displayStableRect, getRawBounds().top - dividerWidth); final int top = Math.max( getRawBounds().top - yOffset, minTopStackBottom + dividerWidthInactive); |