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

Commit 35c9fed8 authored by Winson Chung's avatar Winson Chung Committed by Automerger Merge Worker
Browse files

Merge "Add config for registering shell task organizer" into tm-qpr-dev am:... 

Merge "Add config for registering shell task organizer" into tm-qpr-dev am: 94bd703e am: d5102e86

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20077930



Change-Id: I9452ebc0f44f0751d14bd5b1addfd42511d8d1d2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 21da3fc4 d5102e86

libs/WindowManager/Shell/res/values/config.xml

+4 −0
Original line number Diff line number Diff line
@@ -19,6 +19,10 @@ 
         by the resources of the app using the Shell library. -->

    <bool name="config_enableShellMainThread">false</bool>



    <!-- Determines whether to register the shell task organizer on init.

         TODO(b/238217847): This config is temporary until we refactor the base WMComponent. -->

    <bool name="config_registerShellTaskOrganizerOnInit">true</bool>



    <!-- Animation duration for PIP when entering. -->

    <integer name="config_pipEnterAnimationDuration">425</integer>

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

+6 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import android.view.WindowManager; 
import com.android.internal.logging.UiEventLogger;

import com.android.launcher3.icons.IconProvider;

import com.android.wm.shell.ProtoLogController;

import com.android.wm.shell.R;

import com.android.wm.shell.RootDisplayAreaOrganizer;

import com.android.wm.shell.RootTaskDisplayAreaOrganizer;

import com.android.wm.shell.ShellTaskOrganizer;
@@ -173,6 +174,7 @@ public abstract class WMShellBaseModule { 
    @WMSingleton

    @Provides

    static ShellTaskOrganizer provideShellTaskOrganizer(

            Context context,

            ShellInit shellInit,

            ShellCommandHandler shellCommandHandler,

            CompatUIController compatUI,
@@ -180,6 +182,10 @@ public abstract class WMShellBaseModule { 
            Optional<RecentTasksController> recentTasksOptional,

            @ShellMainThread ShellExecutor mainExecutor

    ) {

        if (!context.getResources().getBoolean(R.bool.config_registerShellTaskOrganizerOnInit)) {

            // TODO(b/238217847): Force override shell init if registration is disabled

            shellInit = new ShellInit(mainExecutor);

        }

        return new ShellTaskOrganizer(shellInit, shellCommandHandler, compatUI,

                unfoldAnimationController, recentTasksOptional, mainExecutor);

    }