diff options
author | 2025-01-13 20:59:12 -0800 | |
---|---|---|
committer | 2025-01-13 20:59:12 -0800 | |
commit | c8afb8d81115dc93f2ffe60e7b2be1f75e7063fe (patch) | |
tree | 64935735fa4095bafab8a62a4562f1e01cc101a0 | |
parent | 3e2ffa78e863bdc5d8bb57b07d02b93af40ed5f9 (diff) | |
parent | 4a8f422a91f29b801e37b4ebf38b50a2b168aedd (diff) |
Merge "Add TS flag to control auto task stack controller in WMShell" into main
4 files changed, 17 insertions, 6 deletions
diff --git a/libs/WindowManager/Shell/Android.bp b/libs/WindowManager/Shell/Android.bp index c6e7f854eef6..bcb6c4f555f7 100644 --- a/libs/WindowManager/Shell/Android.bp +++ b/libs/WindowManager/Shell/Android.bp @@ -173,7 +173,6 @@ android_library { "//frameworks/base/packages/SystemUI/aconfig:com_android_systemui_flags_lib", "//frameworks/libs/systemui:com_android_systemui_shared_flags_lib", "//frameworks/libs/systemui:iconloader_base", - "//packages/apps/Car/SystemUI/aconfig:com_android_systemui_car_flags_lib", "PlatformAnimationLib", "WindowManager-Shell-lite-proto", "WindowManager-Shell-proto", diff --git a/libs/WindowManager/Shell/aconfig/Android.bp b/libs/WindowManager/Shell/aconfig/Android.bp index 7f8f57b172ff..f8da7fa86cff 100644 --- a/libs/WindowManager/Shell/aconfig/Android.bp +++ b/libs/WindowManager/Shell/aconfig/Android.bp @@ -4,6 +4,7 @@ aconfig_declarations { container: "system", srcs: [ "multitasking.aconfig", + "automotive.aconfig", ], } diff --git a/libs/WindowManager/Shell/aconfig/automotive.aconfig b/libs/WindowManager/Shell/aconfig/automotive.aconfig new file mode 100644 index 000000000000..2f25aa460ec1 --- /dev/null +++ b/libs/WindowManager/Shell/aconfig/automotive.aconfig @@ -0,0 +1,11 @@ +# proto-file: build/make/tools/aconfig/aconfig_protos/protos/aconfig.proto + +package: "com.android.wm.shell" +container: "system" + +flag { + name: "enable_auto_task_stack_controller" + namespace: "multitasking" + description: "Enables auto task stack controller to manage task stacks on automotive" + bug: "384082238" +} diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/automotive/AutoTaskStackControllerImpl.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/automotive/AutoTaskStackControllerImpl.kt index f8f284238a98..8171312762ef 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/automotive/AutoTaskStackControllerImpl.kt +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/automotive/AutoTaskStackControllerImpl.kt @@ -33,7 +33,7 @@ import android.view.WindowManager.TRANSIT_CHANGE import android.window.TransitionInfo import android.window.TransitionRequestInfo import android.window.WindowContainerTransaction -import com.android.systemui.car.Flags.autoTaskStackWindowing +import com.android.wm.shell.Flags.enableAutoTaskStackController import com.android.wm.shell.RootTaskDisplayAreaOrganizer import com.android.wm.shell.ShellTaskOrganizer import com.android.wm.shell.common.ShellExecutor @@ -66,7 +66,7 @@ class AutoTaskStackControllerImpl @Inject constructor( private val defaultRootTaskPerDisplay = mutableMapOf<Int, Int>() init { - if (!autoTaskStackWindowing()) { + if (!enableAutoTaskStackController()) { throw IllegalStateException("Failed to initialize" + "AutoTaskStackController as the auto_task_stack_windowing TS flag is disabled.") } else { @@ -220,7 +220,7 @@ class AutoTaskStackControllerImpl @Inject constructor( displayId: Int, listener: RootTaskStackListener ) { - if (!autoTaskStackWindowing()) { + if (!enableAutoTaskStackController()) { Slog.e( TAG, "Failed to create root task stack as the " + "auto_task_stack_windowing TS flag is disabled." @@ -236,7 +236,7 @@ class AutoTaskStackControllerImpl @Inject constructor( } override fun setDefaultRootTaskStackOnDisplay(displayId: Int, rootTaskStackId: Int?) { - if (!autoTaskStackWindowing()) { + if (!enableAutoTaskStackController()) { Slog.e( TAG, "Failed to set default root task stack as the " + "auto_task_stack_windowing TS flag is disabled." @@ -280,7 +280,7 @@ class AutoTaskStackControllerImpl @Inject constructor( } override fun startTransition(transaction: AutoTaskStackTransaction): IBinder? { - if (!autoTaskStackWindowing()) { + if (!enableAutoTaskStackController()) { Slog.e( TAG, "Failed to start transaction as the " + "auto_task_stack_windowing TS flag is disabled." |