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

Commit ef1543fe authored by Matthew DeVore's avatar Matthew DeVore Committed by Android (Google) Code Review
Browse files

Merge "Hide v1 conn. display illust. and Use toggles" into main

parents b602e4b0 cefb6ac1

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