From cefb6ac11fdd87f45537ab1a79c739731fbba8c8 Mon Sep 17 00:00:00 2001
From: Matthew DeVore <matvore@google.com>
Date: Mon, 3 Feb 2025 23:52:44 +0000
Subject: [PATCH] Hide v1 conn. display illust. and Use toggles

In the rotation/resolution preference UI, stop showing UI parts which
are only applicable in the original connected display UI. We will still
show them if the topology pane is disabled.

Flag: com.android.settings.flags.display_topology_pane_in_display_list
Bug: b/366056922
Test: manual
Change-Id: I2897576d5e7eb69a43bf17b967e2ae5f0321998c
---
 .../display/ExternalDisplayPreferenceFragment.java            | 4 +++-
 .../display/ExternalDisplaySettingsConfiguration.java         | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/com/android/settings/connecteddevice/display/ExternalDisplayPreferenceFragment.java b/src/com/android/settings/connecteddevice/display/ExternalDisplayPreferenceFragment.java
index 9f8e87732e3..3718fab212f 100644
--- a/src/com/android/settings/connecteddevice/display/ExternalDisplayPreferenceFragment.java
+++ b/src/com/android/settings/connecteddevice/display/ExternalDisplayPreferenceFragment.java
@@ -419,7 +419,9 @@ public class ExternalDisplayPreferenceFragment extends SettingsPreferenceFragmen
             return;
         }
         final var displayRotation = getDisplayRotation(display.getDisplayId());
-        screen.addPreference(updateIllustrationImage(context, displayRotation));
+        if (!isTopologyPaneEnabled(mInjector)) {
+            screen.addPreference(updateIllustrationImage(context, displayRotation));
+        }
         screen.addPreference(updateResolutionPreference(context, display));
         screen.addPreference(updateRotationPreference(context, display, displayRotation));
         if (isResolutionSettingEnabled(mInjector)) {
diff --git a/src/com/android/settings/connecteddevice/display/ExternalDisplaySettingsConfiguration.java b/src/com/android/settings/connecteddevice/display/ExternalDisplaySettingsConfiguration.java
index c76d28c32bf..2a1fc12e7ef 100644
--- a/src/com/android/settings/connecteddevice/display/ExternalDisplaySettingsConfiguration.java
+++ b/src/com/android/settings/connecteddevice/display/ExternalDisplaySettingsConfiguration.java
@@ -342,7 +342,8 @@ public class ExternalDisplaySettingsConfiguration {
     }
 
     static boolean isUseDisplaySettingEnabled(@Nullable Injector injector) {
-        return injector != null && injector.getFlags().resolutionAndEnableConnectedDisplaySetting();
+        return injector != null && injector.getFlags().resolutionAndEnableConnectedDisplaySetting()
+                && !injector.getFlags().displayTopologyPaneInDisplayList();
     }
 
     static boolean isResolutionSettingEnabled(@Nullable Injector injector) {