am 47e23ec: am e71a630: am ec799e8: Merge "More on #7296510 Transition from lock screen to dreaming is really bad" into jb-mr1-dev

* commit '47e23ecb4cf3754c3e458371313b28d1fb043cdf':
  More on #7296510 Transition from lock screen to dreaming is really bad

Author: Dianne Hackborn

policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

@@ -2925,14 +2925,14 @@ public void applyPostLayoutPolicyLw(WindowState win,
                 mNoDreamEnterAnim = true;
             }
             if (((attrs.type >= FIRST_APPLICATION_WINDOW && attrs.type <= LAST_APPLICATION_WINDOW)
-                        || attrs.type == TYPE_DREAM)
+                        || (attrs.type == TYPE_DREAM && win.isVisibleLw()))
                     && attrs.x == 0 && attrs.y == 0
                     && attrs.width == WindowManager.LayoutParams.MATCH_PARENT
                     && attrs.height == WindowManager.LayoutParams.MATCH_PARENT) {
                 if (DEBUG_LAYOUT) Log.v(TAG, "Fullscreen window: " + win);
                 mTopFullscreenOpaqueWindowState = win;
                 if (attrs.type == TYPE_DREAM) {
-                    mNoDreamEnterAnim = true;
+                    mForceStatusBarFromKeyguard = true;
                 }
                 if ((attrs.flags & FLAG_SHOW_WHEN_LOCKED) != 0) {
                     if (DEBUG_LAYOUT) Log.v(TAG, "Setting mHideLockScreen to true by win " + win);