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

Commit 95c1cbeb authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Also show attached windows during FLAG_SHOW_WHEN_LOCKED animations" into nyc-mr1-dev

parents 59118fc9 435f98de

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

+3 −0
Original line number Diff line number Diff line
@@ -236,6 +236,9 @@ public class WindowAnimator { 
        allowWhenLocked |= (win.mIsImWindow || imeTarget == win) && showImeOverKeyguard;

        // Show SHOW_WHEN_LOCKED windows

        allowWhenLocked |= (win.mAttrs.flags & FLAG_SHOW_WHEN_LOCKED) != 0;

        // Show windows that are attached to SHOW_WHEN_LOCKED windows

        allowWhenLocked |= win.mAttachedWindow != null

                && (win.mAttachedWindow.mAttrs.flags & FLAG_SHOW_WHEN_LOCKED) != 0;



        if (appShowWhenLocked != null) {

            allowWhenLocked |= appShowWhenLocked == win.mAppToken