summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2025-03-10 17:20:53 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 2025-03-10 17:20:53 -0700
commit2a11ba71d75943cb78eeb7fd8917cd40a2b57f69 (patch)
tree409b786e16c41f2cafbb9050aa4cdc7c7da26904
parent45a14a7df87d62ebbffe5054830e3a0191bac953 (diff)
parentb3798156d3cac335c2e4386d2dbd432f67515cf9 (diff)
Merge "Add display disconnect and reconnect flags to dev options." into main
-rw-r--r--core/java/android/window/DesktopExperienceFlags.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/core/java/android/window/DesktopExperienceFlags.java b/core/java/android/window/DesktopExperienceFlags.java
index 866c16cb566d..e3041c00e9fc 100644
--- a/core/java/android/window/DesktopExperienceFlags.java
+++ b/core/java/android/window/DesktopExperienceFlags.java
@@ -56,7 +56,9 @@ public enum DesktopExperienceFlags {
ENABLE_DISPLAY_CONTENT_MODE_MANAGEMENT(
com.android.server.display.feature.flags.Flags::enableDisplayContentModeManagement,
true),
+ ENABLE_DISPLAY_DISCONNECT_INTERACTION(Flags::enableDisplayDisconnectInteraction, false),
ENABLE_DISPLAY_FOCUS_IN_SHELL_TRANSITIONS(Flags::enableDisplayFocusInShellTransitions, true),
+ ENABLE_DISPLAY_RECONNECT_INTERACTION(Flags::enableDisplayReconnectInteraction, false),
ENABLE_DISPLAY_WINDOWING_MODE_SWITCHING(Flags::enableDisplayWindowingModeSwitching, true),
ENABLE_DRAG_TO_MAXIMIZE(Flags::enableDragToMaximize, true),
ENABLE_MOVE_TO_NEXT_DISPLAY_SHORTCUT(Flags::enableMoveToNextDisplayShortcut, true),