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

Commit 17186ff3 authored by Ats Jenk's avatar Ats Jenk
Browse files

Only use DefaultMixedHandler for recents when desktop tasks are visible 

We were always using DefaultMixedHandler for recents transition when
desktop feature flag was enabled. This is not required and we only need
to use it when tasks are actually visible.
When they are not, leave recents transition handling for the
RecentsTransitionHandler.

Bug: 299679976
Test: Open apps on desktop, swipe up to recents, observe from logs that
      DefaultMixedHandler is the transition handler for recents.
      Open an app in fullscreen, swipe up to recents, observer from logs
      that RecentsTransitionHandler is the transition handler for
      recents.
Change-Id: I047de19b9f92366b876c50713995373c4ac9f4a8
parent 60f7ab31

libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultMixedHandler.java

+9 −5
Original line number Diff line number Diff line
@@ -19,10 +19,10 @@ package com.android.wm.shell.transition; 
import static android.app.WindowConfiguration.ACTIVITY_TYPE_HOME;

import static android.app.WindowConfiguration.ACTIVITY_TYPE_RECENTS;

import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN;

import static android.view.Display.DEFAULT_DISPLAY;

import static android.view.WindowManager.TRANSIT_CHANGE;

import static android.view.WindowManager.TRANSIT_TO_BACK;

import static android.window.TransitionInfo.FLAG_IS_WALLPAPER;



import static com.android.wm.shell.common.split.SplitScreenConstants.FLAG_IS_DIVIDER_BAR;

import static com.android.wm.shell.common.split.SplitScreenConstants.SPLIT_POSITION_UNDEFINED;

import static com.android.wm.shell.pip.PipAnimationController.ANIM_TYPE_ALPHA;
@@ -239,9 +239,14 @@ public class DefaultMixedHandler implements Transitions.TransitionHandler, 


    @Override

    public Transitions.TransitionHandler handleRecentsRequest(WindowContainerTransaction outWCT) {

        if (mRecentsHandler != null && (mSplitHandler.isSplitScreenVisible()

                || DesktopModeStatus.isEnabled())) {

        if (mRecentsHandler != null) {

            if (mSplitHandler.isSplitScreenVisible()) {

                return this;

            } else if (mDesktopTasksController != null

                    // Check on the default display. Recents/gesture nav is only available there

                    && mDesktopTasksController.getVisibleTaskCount(DEFAULT_DISPLAY) > 0) {

                return this;

            }

        }

        return null;

    }
@@ -662,7 +667,6 @@ public class DefaultMixedHandler implements Transitions.TransitionHandler, 
        if (!consumed) {

            return false;

        }

        //Sync desktop mode state (proto 2)

        if (mDesktopTasksController != null) {

            mDesktopTasksController.syncSurfaceState(info, finishTransaction);

            return true;