diff options
author | Jeff Brown <jeffbrown@google.com> | 2012-09-25 17:02:06 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-25 17:02:06 -0700 |
commit | 0a52088e58a6ddea0966ba9cd2fbc7bd3e23809a (patch) | |
tree | 2763011daf4a144ed3d89f3b4f51dd2df08633f6 /services | |
parent | 282c51d3912995308901b45d22d1801eec50df41 (diff) | |
parent | 28e0b09a3d22de80cca05499e98a23d5dd82fa15 (diff) | |
download | frameworks_base-0a52088e58a6ddea0966ba9cd2fbc7bd3e23809a.zip frameworks_base-0a52088e58a6ddea0966ba9cd2fbc7bd3e23809a.tar.gz frameworks_base-0a52088e58a6ddea0966ba9cd2fbc7bd3e23809a.tar.bz2 |
Merge "Fix typo." into jb-mr1-dev
Diffstat (limited to 'services')
-rw-r--r-- | services/java/com/android/server/wm/WindowStateAnimator.java | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/services/java/com/android/server/wm/WindowStateAnimator.java b/services/java/com/android/server/wm/WindowStateAnimator.java index b71e38e..acf452f 100644 --- a/services/java/com/android/server/wm/WindowStateAnimator.java +++ b/services/java/com/android/server/wm/WindowStateAnimator.java @@ -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 |