drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 9cf5831f: Merge "Fix jank when launching apps that show wallpaper." into jb-dev

Browse Source 
* commit '9cf5831f2b94f5e2edd7fd87abef4e9fac8aa82d':
  Fix jank when launching apps that show wallpaper.
This commit is contained in:
Craig Mautner
2012-05-23 18:31:25 -07:00
committed by Android Git Automerger
parent a039119e68 9cf5831f2b
commit 270db71381
2 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
services/java/com/android/server/wm/WindowManagerService.java
View File

@ -1636,7 +1636,7 @@ public class WindowManagerService extends IWindowManager.Stub
continue;
}
}
if (DEBUG_WALLPAPER) Slog.v(TAG, "Win " + w + ": readyfordisplay="
if (DEBUG_WALLPAPER) Slog.v(TAG, "Win #" + i + " " + w + ": readyfordisplay="
+ w.isReadyForDisplay() + " mDrawState=" + w.mWinAnimator.mDrawState);
if ((w.mAttrs.flags&FLAG_SHOW_WALLPAPER) != 0 && w.isReadyForDisplay()
&& (mWallpaperTarget == w || w.isDrawnLw())) {
@ -1729,12 +1729,15 @@ public class WindowManagerService extends IWindowManager.Stub
Slog.v(TAG, "Old wallpaper still the target.");
}
mWallpaperTarget = oldW;
}
foundW = oldW;
foundI = oldI;
mLowerWallpaperTarget = null;
mUpperWallpaperTarget = null;
}
// Now set the upper and lower wallpaper targets
// correctly, and make sure that we are positioning
// the wallpaper below the lower.
if (foundI > oldI) {
else if (foundI > oldI) {
// The new target is on top of the old one.
if (DEBUG_WALLPAPER) {
Slog.v(TAG, "Found target above old target.");