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

Merge "Play over-keyguard transitions in default handler" into udc-dev

Browse Source
This commit is contained in:
Robin Lee
2023-05-24 15:09:26 +00:00
committed by Android (Google) Code Review
parent ec8f827230 0c6c517de2
commit 65281547ea
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
libs/WindowManager/Shell/src/com/android/wm/shell/keyguard/KeyguardTransitionHandler.java
View File

@@ -121,21 +121,21 @@ public class KeyguardTransitionHandler implements Transitions.TransitionHandler
} }
boolean hasOpeningOcclude = false; boolean hasOpeningOcclude = false;
boolean hasClosingOcclude = false;
boolean hasOpeningDream = false; boolean hasOpeningDream = false;
boolean hasClosingApp = false; boolean hasClosingApp = false;
// Check for occluding/dream/closing apps // Check for occluding/dream/closing apps
for (int i = info.getChanges().size() - 1; i >= 0; i--) { for (int i = info.getChanges().size() - 1; i >= 0; i--) {
final TransitionInfo.Change change = info.getChanges().get(i); final TransitionInfo.Change change = info.getChanges().get(i);
if (isOpeningType(change.getMode())) { if ((change.getFlags() & TransitionInfo.FLAG_IS_WALLPAPER) != 0) {
if (change.hasFlags(FLAG_OCCLUDES_KEYGUARD)) { continue;
hasOpeningOcclude = true; } else if (isOpeningType(change.getMode())) {
} hasOpeningOcclude |= change.hasFlags(FLAG_OCCLUDES_KEYGUARD);
if (change.getTaskInfo() != null hasOpeningDream |= (change.getTaskInfo() != null
&& change.getTaskInfo().getActivityType() == ACTIVITY_TYPE_DREAM) { && change.getTaskInfo().getActivityType() == ACTIVITY_TYPE_DREAM);
hasOpeningDream = true;
}
} else if (isClosingType(change.getMode())) { } else if (isClosingType(change.getMode())) {
hasClosingOcclude |= change.hasFlags(FLAG_OCCLUDES_KEYGUARD);
hasClosingApp = true; hasClosingApp = true;
} }
} }
@@ -147,6 +147,11 @@ public class KeyguardTransitionHandler implements Transitions.TransitionHandler
transition, info, startTransaction, finishTransaction, finishCallback); transition, info, startTransaction, finishTransaction, finishCallback);
} }
if (hasOpeningOcclude || info.getType() == TRANSIT_KEYGUARD_OCCLUDE) { if (hasOpeningOcclude || info.getType() == TRANSIT_KEYGUARD_OCCLUDE) {
if (hasClosingOcclude) {
// Transitions between apps on top of the keyguard can use the default handler.
// WM sends a final occlude status update after the transition is finished.
return false;
}
if (hasOpeningDream) { if (hasOpeningDream) {
return startAnimation(mOccludeByDreamTransition, return startAnimation(mOccludeByDreamTransition,
"occlude-by-dream", "occlude-by-dream",