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

Commit 503d6a44 authored by Craig Mautner's avatar Craig Mautner
Browse files

DO NOT MERGE Set force hiding differently 

Only force hide windows when the keyguard is animating in.

Fixes bug 6721572.

Change-Id: Iad7b8b811bcf0840726cbf6c6f279dabd08a3aba

Conflicts:

	services/java/com/android/server/wm/WindowAnimator.java
parent 73d90e79

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

+4 −2
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
package com.android.server.wm;



import static android.view.WindowManager.LayoutParams.FLAG_SHOW_WALLPAPER;

import static android.view.WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED;



import static com.android.server.wm.WindowManagerService.LayoutFields.SET_UPDATE_ROTATION;

import static com.android.server.wm.WindowManagerService.LayoutFields.SET_WALLPAPER_MAY_CHANGE;
@@ -278,7 +279,7 @@ public class WindowAnimator { 
                        }

                        mService.mFocusMayChange = true;

                    }

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

                    if (win.isReadyForDisplay() && winAnimator.mAnimationIsEntrance) {

                        mForceHiding = true;

                    }

                    if (WindowManagerService.DEBUG_VISIBILITY) Slog.v(TAG,
@@ -292,7 +293,8 @@ public class WindowAnimator { 
                            + " anim=" + win.mWinAnimator.mAnimation);

                } else if (mPolicy.canBeForceHidden(win, win.mAttrs)) {

                    final boolean changed;

                    if (mForceHiding && !winAnimator.isAnimating()) {

                    if (mForceHiding && (!winAnimator.isAnimating()

                            || (winAnimator.mAttrFlags & FLAG_SHOW_WHEN_LOCKED) == 0)) {

                        changed = win.hideLw(false, false);

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

                                "Now policy hidden: " + win);