Also show attached windows during FLAG_SHOW_WHEN_LOCKED animations am: 435f98de83

am: d8f89315ac

Change-Id: I192683c1423b792ee324546a602def17de9e101b
This commit is contained in:
Jorim Jaggi
2016-09-01 05:39:17 +00:00
committed by android-build-merger

View File

@@ -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