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

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

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

Change-Id: I75e98c47efabeb459b8ec986e76f8cb4fe927b98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Winson Chung
2022-09-30 03:21:18 +00:00
committed by Automerger Merge Worker
parent 06800ea5f1 94bd703e56
commit d5102e860d
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libs/WindowManager/Shell/res/values/config.xml
View File

@@ -19,6 +19,10 @@
by the resources of the app using the Shell library. --> by the resources of the app using the Shell library. -->
<bool name="config_enableShellMainThread">false</bool> <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. --> <!-- Animation duration for PIP when entering. -->
<integer name="config_pipEnterAnimationDuration">425</integer> <integer name="config_pipEnterAnimationDuration">425</integer>

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

@@ -29,6 +29,7 @@ import android.view.WindowManager;
import com.android.internal.logging.UiEventLogger; import com.android.internal.logging.UiEventLogger;
import com.android.launcher3.icons.IconProvider; import com.android.launcher3.icons.IconProvider;
import com.android.wm.shell.ProtoLogController; import com.android.wm.shell.ProtoLogController;
import com.android.wm.shell.R;
import com.android.wm.shell.RootDisplayAreaOrganizer; import com.android.wm.shell.RootDisplayAreaOrganizer;
import com.android.wm.shell.RootTaskDisplayAreaOrganizer; import com.android.wm.shell.RootTaskDisplayAreaOrganizer;
import com.android.wm.shell.ShellTaskOrganizer; import com.android.wm.shell.ShellTaskOrganizer;
@@ -173,6 +174,7 @@ public abstract class WMShellBaseModule {
@WMSingleton @WMSingleton
@Provides @Provides
static ShellTaskOrganizer provideShellTaskOrganizer( static ShellTaskOrganizer provideShellTaskOrganizer(
Context context,
ShellInit shellInit, ShellInit shellInit,
ShellCommandHandler shellCommandHandler, ShellCommandHandler shellCommandHandler,
CompatUIController compatUI, CompatUIController compatUI,
@@ -180,6 +182,10 @@ public abstract class WMShellBaseModule {
Optional<RecentTasksController> recentTasksOptional, Optional<RecentTasksController> recentTasksOptional,
@ShellMainThread ShellExecutor mainExecutor @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, return new ShellTaskOrganizer(shellInit, shellCommandHandler, compatUI,
unfoldAnimationController, recentTasksOptional, mainExecutor); unfoldAnimationController, recentTasksOptional, mainExecutor);
} }