am c1c53e56: Merge "Fix dream/keyguard infinite layout loop." into jb-mr1-dev (409c89c3) · Commits · e / os / android_frameworks_base

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

+9 −6

Original line number	Diff line number	Diff line
		@@ -2965,10 +2965,11 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		boolean applyWindow = attrs.type >= FIRST_APPLICATION_WINDOW
		&& attrs.type <= LAST_APPLICATION_WINDOW;
		if (attrs.type == TYPE_DREAM) {
		// If the lockscreen was showing when the dream started then wait
		// for the dream to draw before hiding the lockscreen.
		if (!mDreamingLockscreen
		\|\| (win.isVisibleLw() && win.hasDrawnLw())) {
		mShowingDream = true;
		if (!mDreamingLockscreen) {
		applyWindow = true;
		} else if (win.isVisibleLw() && win.hasDrawnLw()) {
		applyWindow = true;
		}
		}
		@@ -3008,8 +3009,10 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		? mTopFullscreenOpaqueWindowState.getAttrs()
		: null;

		// If we are not currently showing a dream, then update the lockscreen
		// state that will apply if a dream is shown next time.
		// If we are not currently showing a dream then remember the current
		// lockscreen state. We will use this to determine whether the dream
		// started while the lockscreen was showing and remember this state
		// while the dream is showing.
		if (!mShowingDream) {
		mDreamingLockscreen = mShowingLockscreen;
		}