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

Merge "Fix windows not showing when SHOW_WHEN_LOCKED changes" into lmp-dev

Browse Source
This commit is contained in:
Adrian Roos
2014-07-16 12:11:55 +00:00
committed by Android (Google) Code Review
parent 93d837fd01 4a0ffb004a
commit d4e632bbb6
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/wm/WindowAnimator.java
View File

@@ -248,7 +248,7 @@ public class WindowAnimator {
for (int i = windows.size() - 1; i >= 0; i--) {
WindowState win = windows.get(i);
WindowStateAnimator winAnimator = win.mWinAnimator;
final int flags = winAnimator.mAttrFlags;
final int flags = win.mAttrs.flags;
if (winAnimator.mSurfaceControl != null) {
final boolean wasAnimating = winAnimator.mWasAnimating;
@@ -309,8 +309,7 @@ public class WindowAnimator {
+ " hidden=" + win.mRootToken.hidden
+ " anim=" + win.mWinAnimator.mAnimation);
} else if (mPolicy.canBeForceHidden(win, win.mAttrs)) {
final boolean hideWhenLocked =
(winAnimator.mAttrFlags & FLAG_SHOW_WHEN_LOCKED) == 0;
final boolean hideWhenLocked = (flags & FLAG_SHOW_WHEN_LOCKED) == 0;
final boolean changed;
if (((mForceHiding == KEYGUARD_ANIMATING_IN)
&& (!winAnimator.isAnimating() || hideWhenLocked))
@@ -416,7 +415,7 @@ public class WindowAnimator {
continue;
}
final int flags = winAnimator.mAttrFlags;
final int flags = win.mAttrs.flags;
// If this window is animating, make a note that we have
// an animating window and take care of a request to run

2
services/core/java/com/android/server/wm/WindowStateAnimator.java
View File

@@ -172,7 +172,6 @@ class WindowStateAnimator {
/** Was this window last hidden? */
boolean mLastHidden;
int mAttrFlags;
int mAttrType;
public WindowStateAnimator(final WindowState win) {
@@ -197,7 +196,6 @@ class WindowStateAnimator {
? null : win.mAttachedWindow.mWinAnimator;
mAppAnimator = win.mAppToken == null ? null : win.mAppToken.mAppAnimator;
mSession = win.mSession;
mAttrFlags = win.mAttrs.flags;
mAttrType = win.mAttrs.type;
mIsWallpaper = win.mIsWallpaper;
}