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

am 0a52088e: Merge "Fix typo." into jb-mr1-dev

Browse Source 
* commit '0a52088e58a6ddea0966ba9cd2fbc7bd3e23809a':
  Fix typo.
This commit is contained in:
Jeff Brown
2012-09-25 17:05:12 -07:00
committed by Android Git Automerger
parent eb6c0d5d15 0a52088e58
commit 7a0184b70c
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/java/com/android/server/wm/WindowStateAnimator.java
View File

@@ -1055,11 +1055,12 @@ class WindowStateAnimator {
// just keep the crop rect the same as the source surface.
w.mSystemDecorRect.set(0, 0, w.mRequestedWidth, w.mRequestedHeight);
} else if (!w.isDefaultDisplay()) {
// On a different display is easy, just use the entire display.
// On a different display there is no system decor. Crop the window
// by the screen boundaries.
w.mSystemDecorRect.set(0, 0, w.mCompatFrame.width(), w.mCompatFrame.height());
w.mSystemDecorRect.intersect(-w.mFrame.left, -w.mFrame.top,
displayInfo.logicalWidth - w.mFrame.left,
displayInfo.logicalHeight - w.mFrame.top);
w.mSystemDecorRect.intersect(-w.mCompatFrame.left, -w.mCompatFrame.top,
displayInfo.logicalWidth - w.mCompatFrame.left,
displayInfo.logicalHeight - w.mCompatFrame.top);
} else if (w.mLayer >= mService.mSystemDecorLayer) {
// Above the decor layer is easy, just use the entire window.
// Unless we have a universe background... in which case all the