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

Commit 8b9c6d51 authored by Craig Mautner's avatar Craig Mautner Committed by Android (Google) Code Review
Browse files

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

parents a676cdab f03e4c55

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -2968,7 +2968,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
    }

    }





    public boolean allowAppAnimationsLw() {

    public boolean allowAppAnimationsLw() {

        if (mKeyguard != null && mKeyguard.isVisibleLw()) {

        if (mKeyguard != null && mKeyguard.isVisibleLw() && !mKeyguard.isAnimatingLw()) {

            // If keyguard is currently visible, no reason to animate

            // If keyguard is currently visible, no reason to animate

            // behind it.

            // behind it.

            return false;

            return false;

services/java/com/android/server/wm/WindowAnimator.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -279,7 +279,7 @@ public class WindowAnimator { 
                        }

                        }

                        mService.mFocusMayChange = true;

                        mService.mFocusMayChange = true;

                    }

                    }

                    if (win.isReadyForDisplay()) {

                    if (win.isReadyForDisplay() && !winAnimator.isAnimating()) {

                        mForceHiding = true;

                        mForceHiding = true;

                    }

                    }

                    if (WindowManagerService.DEBUG_VISIBILITY) Slog.v(TAG,

                    if (WindowManagerService.DEBUG_VISIBILITY) Slog.v(TAG,