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

Commit 168d2b61 authored by Massimo Carli's avatar Massimo Carli Committed by Android (Google) Code Review
Browse files

Merge "[38/n] Migrate to TransitionObserver with LifecycleController" into main

parents 9ec5f6b4 9a34de2d

libs/WindowManager/Shell/src/com/android/wm/shell/dagger/LetterboxModule.java

+15 −4
Original line number Diff line number Diff line
@@ -19,9 +19,11 @@ package com.android.wm.shell.dagger; 
import android.annotation.NonNull;



import com.android.wm.shell.common.transition.TransitionStateHolder;

import com.android.wm.shell.compatui.letterbox.DelegateLetterboxTransitionObserver;

import com.android.wm.shell.compatui.letterbox.LetterboxControllerStrategy;

import com.android.wm.shell.compatui.letterbox.LetterboxTransitionObserver;

import com.android.wm.shell.compatui.letterbox.MixedLetterboxController;

import com.android.wm.shell.compatui.letterbox.lifecycle.LetterboxLifecycleController;

import com.android.wm.shell.compatui.letterbox.lifecycle.LetterboxLifecycleControllerImpl;

import com.android.wm.shell.sysui.ShellInit;

import com.android.wm.shell.transition.Transitions;
@@ -36,14 +38,23 @@ public abstract class LetterboxModule { 


    @WMSingleton

    @Provides

    static LetterboxTransitionObserver provideLetterboxTransitionObserver(

    static DelegateLetterboxTransitionObserver provideDelegateLetterboxTransitionObserver(

            @NonNull ShellInit shellInit,

            @NonNull Transitions transitions,

            @NonNull LetterboxLifecycleController letterboxLifecycleController

    ) {

        return new DelegateLetterboxTransitionObserver(shellInit, transitions,

                letterboxLifecycleController);

    }



    @WMSingleton

    @Provides

    static LetterboxLifecycleController provideLetterboxLifecycleController(

            @NonNull MixedLetterboxController letterboxController,

            @NonNull TransitionStateHolder transitionStateHolder,

            @NonNull LetterboxControllerStrategy letterboxControllerStrategy

    ) {

        return new LetterboxTransitionObserver(shellInit, transitions, letterboxController,

                transitionStateHolder, letterboxControllerStrategy);

        return new LetterboxLifecycleControllerImpl(letterboxController, transitionStateHolder,

                letterboxControllerStrategy);

    }

}

libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellModule.java

+2 −2
Original line number Diff line number Diff line
@@ -84,8 +84,8 @@ import com.android.wm.shell.common.TaskStackListenerImpl; 
import com.android.wm.shell.common.UserProfileContexts;

import com.android.wm.shell.common.split.SplitState;

import com.android.wm.shell.compatui.api.CompatUIHandler;

import com.android.wm.shell.compatui.letterbox.DelegateLetterboxTransitionObserver;

import com.android.wm.shell.compatui.letterbox.LetterboxCommandHandler;

import com.android.wm.shell.compatui.letterbox.LetterboxTransitionObserver;

import com.android.wm.shell.crashhandling.ShellCrashHandler;

import com.android.wm.shell.dagger.back.ShellBackAnimationModule;

import com.android.wm.shell.dagger.pip.PipModule;
@@ -1723,7 +1723,7 @@ public abstract class WMShellModule { 
    @Provides

    static Object provideIndependentShellComponentsToCreate(

            DragAndDropController dragAndDropController,

            @NonNull LetterboxTransitionObserver letterboxTransitionObserver,

            @NonNull DelegateLetterboxTransitionObserver letterboxTransitionObserver,

            @NonNull LetterboxCommandHandler letterboxCommandHandler,

            Optional<DesktopTasksTransitionObserver> desktopTasksTransitionObserverOptional,

            Optional<DesktopDisplayEventHandler> desktopDisplayEventHandler,