Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cefb6ac1 authored by Matthew DeVore's avatar Matthew DeVore
Browse files

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
parent 88307075

src/com/android/settings/connecteddevice/display/ExternalDisplayPreferenceFragment.java

+3 −1
Original line number Diff line number Diff line
@@ -419,7 +419,9 @@ public class ExternalDisplayPreferenceFragment extends SettingsPreferenceFragmen 
            return;

        }

        final var displayRotation = getDisplayRotation(display.getDisplayId());

        if (!isTopologyPaneEnabled(mInjector)) {

            screen.addPreference(updateIllustrationImage(context, displayRotation));

        }

        screen.addPreference(updateResolutionPreference(context, display));

        screen.addPreference(updateRotationPreference(context, display, displayRotation));

        if (isResolutionSettingEnabled(mInjector)) {

src/com/android/settings/connecteddevice/display/ExternalDisplaySettingsConfiguration.java

+2 −1
Original line number Diff line number Diff line
@@ -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) {