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

Commit 3e95ab97 authored by Jim Miller's avatar Jim Miller Committed by Android Git Automerger
Browse files

am 88d2d039: am 3de6a9b6: Merge "Fix 4025684: Don\'t include wallpaper... 

am 88d2d039: am 3de6a9b6: Merge "Fix 4025684: Don\'t include wallpaper dimensions in bounds calculation" into honeycomb-mr1

* commit '88d2d039':
  Fix 4025684: Don't include wallpaper dimensions in bounds calculation
parents 2bf0410b 88d2d039

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

+11 −7
Original line number Diff line number Diff line
@@ -4791,6 +4791,9 @@ public class WindowManagerService extends IWindowManager.Stub 
                if (maxLayer < ws.mAnimLayer) {

                    maxLayer = ws.mAnimLayer;

                }

                

                // Don't include wallpaper in bounds calculation

                if (!ws.mIsWallpaper) {

                    final Rect wf = ws.mFrame;

                    final Rect cr = ws.mContentInsets;

                    int left = wf.left + cr.left;
@@ -4799,6 +4802,7 @@ public class WindowManagerService extends IWindowManager.Stub 
                    int bottom = wf.bottom - cr.bottom;

                    frame.union(left, top, right, bottom);

                }

            }

            Binder.restoreCallingIdentity(ident);



            // Constrain frame to the screen size.