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
diff --git a/src/com/android/settings/connecteddevice/display/ExternalDisplayPreferenceFragment.java b/src/com/android/settings/connecteddevice/display/ExternalDisplayPreferenceFragment.java
index 9f8e877..3718fab 100644
--- a/src/com/android/settings/connecteddevice/display/ExternalDisplayPreferenceFragment.java
+++ b/src/com/android/settings/connecteddevice/display/ExternalDisplayPreferenceFragment.java
@@ -419,7 +419,9 @@
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 c76d28c..2a1fc12 100644
--- a/src/com/android/settings/connecteddevice/display/ExternalDisplaySettingsConfiguration.java
+++ b/src/com/android/settings/connecteddevice/display/ExternalDisplaySettingsConfiguration.java
@@ -342,7 +342,8 @@
}
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) {