Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7a0184b7 authored by Jeff Brown's avatar Jeff Brown Committed by Android Git Automerger
Browse files

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

* commit '0a52088e':
  Fix typo.
parents eb6c0d5d 0a52088e

services/java/com/android/server/wm/WindowStateAnimator.java

+5 −4
Original line number Diff line number Diff line
@@ -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