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
This commit is contained in:
Matthew DeVore
2025-02-03 23:52:44 +00:00
parent 883070758b
commit cefb6ac11f
2 changed files with 5 additions and 2 deletions

View File

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

View File

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