Merge "Call deferred windowFocusChange when draw complete" into jb-dev

Author: Craig Mautner

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

@@ -8324,10 +8324,6 @@ private final void performLayoutAndPlaceSurfacesLockedInner(
             for (i=N-1; i>=0; i--) {
                 WindowState w = mWindows.get(i);
 
-                if (someoneLosingFocus && w == mCurrentFocus && w.isDisplayedLw()) {
-                    focusDisplayed = true;
-                }
-
                 final boolean obscuredChanged = w.mObscured != mInnerFields.mObscured;
 
                 // Update effect.
@@ -8385,6 +8381,10 @@ private final void performLayoutAndPlaceSurfacesLockedInner(
                     winAnimator.setSurfaceBoundaries(recoveringMemory);
                 }
 
+                if (someoneLosingFocus && w == mCurrentFocus && w.isDisplayedLw()) {
+                    focusDisplayed = true;
+                }
+
                 updateResizingWindows(w);
             }