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) {