| commit | ef1543fe6bc83386070dacd40ae5979f72ee4234 | [log] [tgz] |
|---|---|---|
| author | Matthew DeVore <matvore@google.com> | Tue Feb 04 15:56:51 2025 -0800 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Feb 04 15:56:51 2025 -0800 |
| tree | efb0cced1f630f259a0c1dd60aa84c12265c03a4 | |
| parent | b602e4b0fc58c2f4dcfb9b994a2325a7ee01aba9 [diff] | |
| parent | cefb6ac11fdd87f45537ab1a79c739731fbba8c8 [diff] |
Merge "Hide v1 conn. display illust. and Use toggles" into main
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) {