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

Merge "Fix override insets when dragging divider in split-screen" into nyc-dev

Browse Source 
am: 5cec2d8

* commit '5cec2d8aa9565a299565148bf04bfdd0efa8c37d':
  Fix override insets when dragging divider in split-screen

Change-Id: I016f8d4787a7c750d887c47c78df8d48e2a51512
This commit is contained in:
Andrii Kulian
2016-04-05 18:27:14 +00:00
committed by android-build-merger
parent 78f0b88bfd 5cec2d8aa9
commit 190e7e8134
1 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
services/core/java/com/android/server/wm/WindowState.java
View File

@@ -807,26 +807,31 @@ final class WindowState implements WindowManagerPolicy.WindowState {
mContentInsets.setEmpty();
mVisibleInsets.setEmpty();
} else {
// Using mContentInsets as a temp rect. It is safe because we're setting it below.
getDisplayContent().getLogicalDisplayRect(mContentInsets);
getDisplayContent().getLogicalDisplayRect(mTmpRect);
// Override right and/or bottom insets in case if the frame doesn't fit the screen in
// non-fullscreen mode.
boolean overrideRightInset = !fullscreenTask && mFrame.right > mContentInsets.right;
boolean overrideBottomInset = !fullscreenTask && mFrame.bottom > mContentInsets.bottom;
boolean overrideRightInset = !fullscreenTask && mFrame.right > mTmpRect.right;
boolean overrideBottomInset = !fullscreenTask && mFrame.bottom > mTmpRect.bottom;
mContentInsets.set(mContentFrame.left - frame.left,
mContentFrame.top - frame.top,
overrideRightInset ? 0 : frame.right - mContentFrame.right,
overrideBottomInset ? 0 : frame.bottom - mContentFrame.bottom);
overrideRightInset ? mTmpRect.right - mContentFrame.right
: frame.right - mContentFrame.right,
overrideBottomInset ? mTmpRect.bottom - mContentFrame.bottom
: frame.bottom - mContentFrame.bottom);
mVisibleInsets.set(mVisibleFrame.left - frame.left,
mVisibleFrame.top - frame.top,
overrideRightInset ? 0 : frame.right - mVisibleFrame.right,
overrideBottomInset ? 0 : frame.bottom - mVisibleFrame.bottom);
overrideRightInset ? mTmpRect.right - mVisibleFrame.right
: frame.right - mVisibleFrame.right,
overrideBottomInset ? mTmpRect.bottom - mVisibleFrame.bottom
: frame.bottom - mVisibleFrame.bottom);
mStableInsets.set(Math.max(mStableFrame.left - frame.left, 0),
Math.max(mStableFrame.top - frame.top, 0),
overrideRightInset ? 0 : Math.max(frame.right - mStableFrame.right, 0),
overrideBottomInset ? 0 : Math.max(frame.bottom - mStableFrame.bottom, 0));
overrideRightInset ? Math.max(mTmpRect.right - mStableFrame.right, 0)
: Math.max(frame.right - mStableFrame.right, 0),
overrideBottomInset ? Math.max(mTmpRect.bottom - mStableFrame.bottom, 0)
: Math.max(frame.bottom - mStableFrame.bottom, 0));
}
if (!mInsetFrame.isEmpty()) {