Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix dream/keyguard infinite layout loop." into jb-mr1-dev

Browse Source
This commit is contained in:
Jeff Brown
2012-10-31 16:42:26 -07:00
committed by Android (Google) Code Review
parent c01d1045ef c8018ebe7c
commit c1c53e56fb
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
View File

@@ -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) {
mShowingDream = true;
if (!mDreamingLockscreen) {
applyWindow = true;
} else if (win.isVisibleLw() && win.hasDrawnLw()) {
// 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;
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;
}