commit f12100e0255c86d0d05dba2e7ba87a745870423d
author Craig Mautner <cmautner@google.com> Mon Jun 25 11:13:24 2012 -0700
committer Craig Mautner <cmautner@google.com> Mon Jun 25 11:13:24 2012 -0700
tree e180360513b6b4a4dfbfee58c5b975016ac36dc9
parent 10943335a4098b8757f6000d0cc8e3e6cd121acd

Eliminate jank by setting force hiding differently

Only force hide windows when the keyguard is animating in.

Fixes bug 6721572.

Change-Id: Iad7b8b811bcf0840726cbf6c6f279dabd08a3aba

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

diff --git a/services/java/com/android/server/wm/WindowAnimator.java b/services/java/com/android/server/wm/WindowAnimator.java
index 168b272..85ae77c 100644
--- a/services/java/com/android/server/wm/WindowAnimator.java
+++ b/services/java/com/android/server/wm/WindowAnimator.java
@@ -3,6 +3,7 @@
 package com.android.server.wm;
 
 import static android.view.WindowManager.LayoutParams.FLAG_SHOW_WALLPAPER;
+import static android.view.WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED;
 
 import static com.android.server.wm.WindowManagerService.LayoutFields.SET_UPDATE_ROTATION;
 import static com.android.server.wm.WindowManagerService.LayoutFields.SET_WALLPAPER_MAY_CHANGE;
@@ -300,7 +301,7 @@
                         }
                         mService.mFocusMayChange = true;
                     }
-                    if (win.isReadyForDisplay() && !winAnimator.isAnimating()) {
+                    if (win.isReadyForDisplay() && winAnimator.mAnimationIsEntrance) {
                         mInner.mForceHiding = true;
                     }
                     if (WindowManagerService.DEBUG_VISIBILITY) Slog.v(TAG,
@@ -314,7 +315,8 @@
                             + " anim=" + win.mWinAnimator.mAnimation);
                 } else if (mPolicy.canBeForceHidden(win, win.mAttrs)) {
                     final boolean changed;
-                    if (mInner.mForceHiding && !winAnimator.isAnimating()) {
+                    if (mInner.mForceHiding && (!winAnimator.isAnimating()
+                            || (winAnimator.mAttrFlags & FLAG_SHOW_WHEN_LOCKED) == 0)) {
                         changed = win.hideLw(false, false);
                         if (WindowManagerService.DEBUG_VISIBILITY && changed) Slog.v(TAG,
                                 "Now policy hidden: " + win);