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

Commit 7795fa35 authored by Robin Lee's avatar Robin Lee Committed by Android (Google) Code Review
Browse files

Merge "Don't merge recents with any keyguard transition" into main

parents e6c124d0 1184d581

libs/WindowManager/Shell/src/com/android/wm/shell/recents/RecentsTransitionHandler.java

+2 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.wm.shell.recents; 
import static android.app.ActivityTaskManager.INVALID_TASK_ID;

import static android.app.WindowConfiguration.ACTIVITY_TYPE_HOME;

import static android.app.WindowConfiguration.ACTIVITY_TYPE_RECENTS;

import static android.view.WindowManager.KEYGUARD_VISIBILITY_TRANSIT_FLAGS;

import static android.view.WindowManager.TRANSIT_CHANGE;

import static android.view.WindowManager.TRANSIT_FLAG_KEYGUARD_LOCKED;

import static android.view.WindowManager.TRANSIT_SLEEP;
@@ -591,7 +592,7 @@ public class RecentsTransitionHandler implements Transitions.TransitionHandler { 
                cancel("transit_sleep");

                return;

            }

            if (mKeyguardLocked || (info.getFlags() & TRANSIT_FLAG_KEYGUARD_LOCKED) != 0) {

            if (mKeyguardLocked || (info.getFlags() & KEYGUARD_VISIBILITY_TRANSIT_FLAGS) != 0) {

                ProtoLog.v(ShellProtoLogGroup.WM_SHELL_RECENTS_TRANSITION,

                        "[%d] RecentsController.merge: keyguard is locked", mInstanceId);

                // We will not accept new changes if we are swiping over the keyguard.