PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Matthew DeVore
2025-02-04 15:56:51 -08:00
committed by Android (Google) Code Review
parent b602e4b0fc cefb6ac11f
commit ef1543fe6b
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/connecteddevice/display/ExternalDisplayPreferenceFragment.java
View File

@@ -419,7 +419,9 @@ public class ExternalDisplayPreferenceFragment extends SettingsPreferenceFragmen
return; return;
} }
final var displayRotation = getDisplayRotation(display.getDisplayId()); 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(updateResolutionPreference(context, display));
screen.addPreference(updateRotationPreference(context, display, displayRotation)); screen.addPreference(updateRotationPreference(context, display, displayRotation));
if (isResolutionSettingEnabled(mInjector)) { if (isResolutionSettingEnabled(mInjector)) {

3
src/com/android/settings/connecteddevice/display/ExternalDisplaySettingsConfiguration.java
View File

@@ -342,7 +342,8 @@ public class ExternalDisplaySettingsConfiguration {
} }
static boolean isUseDisplaySettingEnabled(@Nullable Injector injector) { 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) { static boolean isResolutionSettingEnabled(@Nullable Injector injector) {