1 files changed, 9 insertions, 3 deletions
diff --git a/Settings/src/com/android/tv/settings/device/displaysound/ResolutionSelectionFragment.java b/Settings/src/com/android/tv/settings/device/displaysound/ResolutionSelectionFragment.java
index db515ba65..787c4e55c 100644
--- a/Settings/src/com/android/tv/settings/device/displaysound/ResolutionSelectionFragment.java
+++ b/Settings/src/com/android/tv/settings/device/displaysound/ResolutionSelectionFragment.java
@@ -19,7 +19,6 @@ package com.android.tv.settings.device.displaysound;
 import static android.content.DialogInterface.OnClickListener;
 import static android.view.Display.HdrCapabilities.HDR_TYPE_DOLBY_VISION;
 import static android.view.Display.HdrCapabilities.HDR_TYPE_INVALID;
-
 import static com.android.tv.settings.device.displaysound.DisplaySoundUtils.createAlertDialog;
 import static com.android.tv.settings.device.displaysound.DisplaySoundUtils.doesCurrentModeNotSupportDvBecauseLimitedTo4k30;
 import static com.android.tv.settings.device.displaysound.DisplaySoundUtils.isHdrFormatSupported;
@@ -46,6 +45,7 @@ import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.tv.settings.PreferenceControllerFragment;
 import com.android.tv.settings.R;
 import com.android.tv.settings.RadioPreference;
+import com.android.tv.settings.overlay.FlavorUtils;
 import com.android.tv.settings.util.ResolutionSelectionUtils;
 
 import java.util.Arrays;
@@ -153,7 +153,7 @@ public class ResolutionSelectionFragment extends PreferenceControllerFragment {
                         mAutoMode.getPhysicalWidth(), mAutoMode.getPhysicalHeight()),
                 ResolutionSelectionUtils.getRefreshRateString(mAutoMode.getRefreshRate()));
         pref.setSummary(summary);
-        pref.setFragment(ResolutionSelectionInfo.HDRInfoFragment.class.getName());
+        configureResolutionPreference(pref);
         pref.getExtras().putIntArray(HDR_TYPES_ARRAY, mAutoMode.getSupportedHdrTypes());
         mResolutionPreferenceCategory.addPreference(pref);
 
@@ -175,7 +175,7 @@ public class ResolutionSelectionFragment extends PreferenceControllerFragment {
         pref.setTitle(title);
         pref.setSummary(summary);
         pref.setKey(KEY_RESOLUTION_PREFIX + resolution);
-        pref.setFragment(ResolutionSelectionInfo.HDRInfoFragment.class.getName());
+        configureResolutionPreference(pref);
         pref.getExtras().putIntArray(HDR_TYPES_ARRAY, mode.getSupportedHdrTypes());
         return pref;
     }
@@ -195,6 +195,12 @@ public class ResolutionSelectionFragment extends PreferenceControllerFragment {
         radioPreference.clearOtherRadioPreferences(getPreferenceGroup());
     }
 
+    private void configureResolutionPreference(Preference pref) {
+        if (FlavorUtils.isTwoPanel(getContext())) {
+            pref.setFragment(ResolutionSelectionInfo.HDRInfoFragment.class.getName());
+        }
+    }
+
     @Override
     public boolean onPreferenceTreeClick(Preference preference) {
         String key = preference.getKey();