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

Commit 47e23ecb authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am e71a630f: am ec799e88: Merge "More on #7296510 Transition from lock screen... 

am e71a630f: am ec799e88: Merge "More on #7296510 Transition from lock screen to dreaming is really bad" into jb-mr1-dev

* commit 'e71a630f':
  More on #7296510 Transition from lock screen to dreaming is really bad
parents 1b07e93f e71a630f

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -2925,14 +2925,14 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                mNoDreamEnterAnim = true;

                mNoDreamEnterAnim = true;

            }

            }

            if (((attrs.type >= FIRST_APPLICATION_WINDOW && attrs.type <= LAST_APPLICATION_WINDOW)

            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.x == 0 && attrs.y == 0

                    && attrs.width == WindowManager.LayoutParams.MATCH_PARENT

                    && attrs.width == WindowManager.LayoutParams.MATCH_PARENT

                    && attrs.height == WindowManager.LayoutParams.MATCH_PARENT) {

                    && attrs.height == WindowManager.LayoutParams.MATCH_PARENT) {

                if (DEBUG_LAYOUT) Log.v(TAG, "Fullscreen window: " + win);

                if (DEBUG_LAYOUT) Log.v(TAG, "Fullscreen window: " + win);

                mTopFullscreenOpaqueWindowState = win;

                mTopFullscreenOpaqueWindowState = win;

                if (attrs.type == TYPE_DREAM) {

                if (attrs.type == TYPE_DREAM) {

                    mNoDreamEnterAnim = true;

                    mForceStatusBarFromKeyguard = true;

                }

                }

                if ((attrs.flags & FLAG_SHOW_WHEN_LOCKED) != 0) {

                if ((attrs.flags & FLAG_SHOW_WHEN_LOCKED) != 0) {

                    if (DEBUG_LAYOUT) Log.v(TAG, "Setting mHideLockScreen to true by win " + win);

                    if (DEBUG_LAYOUT) Log.v(TAG, "Setting mHideLockScreen to true by win " + win);