From 2877a2fb3fafca6655a7b804cc5bcc8c21aae5cc Mon Sep 17 00:00:00 2001
From: Toni Barzic <tbarzic@google.com>
Date: Tue, 8 Apr 2025 20:52:42 +0000
Subject: [PATCH] Use DesktopExperienceFlags for freeform display taskbar

Bug: 390665752
Flag: com.android.window.flags.enable_desktop_taskbar_on_freeform_displays
Test: None
Change-Id: I40ac43f50c980e6076bb5a842ceaf15702e71738
---
 .../com/android/quickstep/util/SystemWindowManagerProxy.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/util/SystemWindowManagerProxy.java b/quickstep/src/com/android/quickstep/util/SystemWindowManagerProxy.java
index 05eede3ef4..b6eccaf9e1 100644
--- a/quickstep/src/com/android/quickstep/util/SystemWindowManagerProxy.java
+++ b/quickstep/src/com/android/quickstep/util/SystemWindowManagerProxy.java
@@ -25,6 +25,7 @@ import android.view.DisplayCutout;
 import android.view.Surface;
 import android.view.WindowManager;
 import android.view.WindowMetrics;
+import android.window.DesktopExperienceFlags;
 
 import com.android.internal.policy.SystemBarUtils;
 import com.android.launcher3.dagger.LauncherAppSingleton;
@@ -33,7 +34,6 @@ import com.android.launcher3.util.WindowBounds;
 import com.android.launcher3.util.window.CachedDisplayInfo;
 import com.android.launcher3.util.window.WindowManagerProxy;
 import com.android.quickstep.SystemUiProxy;
-import com.android.window.flags.Flags;
 import com.android.wm.shell.shared.desktopmode.DesktopModeStatus;
 
 import java.util.List;
@@ -103,7 +103,7 @@ public class SystemWindowManagerProxy extends WindowManagerProxy {
             return false;
         }
 
-        if (!Flags.enableDesktopTaskbarOnFreeformDisplays()) {
+        if (!DesktopExperienceFlags.ENABLE_DESKTOP_TASKBAR_ON_FREEFORM_DISPLAYS.isTrue()) {
             return false;
         }