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

Merge "Expose apps when keyguard animating." into jb-dev

Browse Source
This commit is contained in:
Craig Mautner
2012-06-14 14:55:19 -07:00
committed by Android (Google) Code Review
parent a676cdab11 f03e4c55fc
commit 8b9c6d51d5
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2968,7 +2968,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
}
public boolean allowAppAnimationsLw() {
if (mKeyguard != null && mKeyguard.isVisibleLw()) {
if (mKeyguard != null && mKeyguard.isVisibleLw() && !mKeyguard.isAnimatingLw()) {
// If keyguard is currently visible, no reason to animate
// behind it.
return false;

2
services/java/com/android/server/wm/WindowAnimator.java
View File

@@ -279,7 +279,7 @@ public class WindowAnimator {
}
mService.mFocusMayChange = true;
}
if (win.isReadyForDisplay()) {
if (win.isReadyForDisplay() && !winAnimator.isAnimating()) {
mForceHiding = true;
}
if (WindowManagerService.DEBUG_VISIBILITY) Slog.v(TAG,