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

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

Browse Source
This commit is contained in:
TreeHugger Robot
2016-09-01 04:16:52 +00:00
committed by Android (Google) Code Review
parent 59118fc9df 435f98de83
commit 95c1cbeb50
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/wm/WindowAnimator.java
View File

@@ -236,6 +236,9 @@ public class WindowAnimator {
allowWhenLocked |= (win.mIsImWindow || imeTarget == win) && showImeOverKeyguard; allowWhenLocked |= (win.mIsImWindow || imeTarget == win) && showImeOverKeyguard;
// Show SHOW_WHEN_LOCKED windows // Show SHOW_WHEN_LOCKED windows
allowWhenLocked |= (win.mAttrs.flags & FLAG_SHOW_WHEN_LOCKED) != 0; 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) { if (appShowWhenLocked != null) {
allowWhenLocked |= appShowWhenLocked == win.mAppToken allowWhenLocked |= appShowWhenLocked == win.mAppToken