Add skip_compat_ui_education_in_desktop_mode to dev options.

Flag: com.android.window.flags.skip_compat_ui_education_in_desktop_mode
Bug: 391626384
Test: atest WMShellUnitTests:CompatUIControllerTest

Change-Id: I201b84428bdba561f7b2aad4bcadb46752274a40

1 files changed, 3 insertions, 2 deletions

diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/CompatUIController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/CompatUIController.java
index fe6066c8c4fb..201870fe0181 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/CompatUIController.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/CompatUIController.java
@@ -37,9 +37,9 @@ import android.view.Display;
 import android.view.InsetsSourceControl;
 import android.view.InsetsState;
 import android.view.accessibility.AccessibilityManager;
+import android.window.DesktopModeFlags;
 
 import com.android.internal.annotations.VisibleForTesting;
-import com.android.window.flags.Flags;
 import com.android.wm.shell.ShellTaskOrganizer;
 import com.android.wm.shell.common.DisplayController;
 import com.android.wm.shell.common.DisplayController.OnDisplaysChangedListener;
@@ -873,6 +873,7 @@ public class CompatUIController implements OnDisplaysChangedListener,
         }
         boolean isDesktopModeShowing = mDesktopUserRepositories.get().getCurrent()
                 .getVisibleTaskCount(taskInfo.displayId) > 0;
-        return Flags.skipCompatUiEducationInDesktopMode() && isDesktopModeShowing;
+        return DesktopModeFlags.ENABLE_DESKTOP_SKIP_COMPAT_UI_EDUCATION_IN_DESKTOP_MODE_BUGFIX
+                .isTrue() && isDesktopModeShowing;
     }
 }