diff options
Diffstat (limited to 'Settings/src/com/android/tv/settings/device/displaysound')
-rw-r--r-- | Settings/src/com/android/tv/settings/device/displaysound/ResolutionSelectionFragment.java | 3 | ||||
-rw-r--r-- | Settings/src/com/android/tv/settings/device/displaysound/ResolutionSelectionInfo.java | 22 |
2 files changed, 15 insertions, 10 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 b7426e7d0..db515ba65 100644 --- a/Settings/src/com/android/tv/settings/device/displaysound/ResolutionSelectionFragment.java +++ b/Settings/src/com/android/tv/settings/device/displaysound/ResolutionSelectionFragment.java @@ -169,7 +169,8 @@ public class ResolutionSelectionFragment extends PreferenceControllerFragment { mode.getPhysicalWidth(), mode.getPhysicalHeight()), ResolutionSelectionUtils.getRefreshRateString(mode.getRefreshRate())); - String summary = mode.getPhysicalWidth() + " x " + mode.getPhysicalHeight(); + String summary = ResolutionSelectionUtils.getResolutionSummary(mode.getPhysicalWidth(), + mode.getPhysicalHeight()); RadioPreference pref = new RadioPreference(getContext()); pref.setTitle(title); pref.setSummary(summary); diff --git a/Settings/src/com/android/tv/settings/device/displaysound/ResolutionSelectionInfo.java b/Settings/src/com/android/tv/settings/device/displaysound/ResolutionSelectionInfo.java index 73463b2f4..3f3c9ff11 100644 --- a/Settings/src/com/android/tv/settings/device/displaysound/ResolutionSelectionInfo.java +++ b/Settings/src/com/android/tv/settings/device/displaysound/ResolutionSelectionInfo.java @@ -44,28 +44,32 @@ public class ResolutionSelectionInfo { public static class HDRInfoFragment extends ResolutionSelectionInfo.BaseInfoFragment { private String hdrTypesAsString(int[] hdrTypes) { - StringBuilder supportedTypes = new StringBuilder( - getResources().getString(R.string.hdr_format_sdr)); + StringBuilder supportedTypes = new StringBuilder(System.lineSeparator()).append( + getResources().getString(R.string.hdr_capability, + getResources().getString(R.string.hdr_format_sdr))); for (int supportedType : hdrTypes) { - supportedTypes.append(getResources().getString(R.string.word_separator)) - .append(getResources().getString( - R.string.space_separator)); + supportedTypes.append(System.lineSeparator()); switch (supportedType) { case HDR_TYPE_DOLBY_VISION: supportedTypes - .append(getResources().getString(R.string.hdr_format_dolby_vision)); + .append(getResources().getString(R.string.hdr_capability, + getResources().getString( + R.string.hdr_format_dolby_vision))); break; case HDR_TYPE_HDR10: supportedTypes - .append(getResources().getString(R.string.hdr_format_hdr10)); + .append(getResources().getString(R.string.hdr_capability, + getResources().getString(R.string.hdr_format_hdr10))); break; case HDR_TYPE_HLG: supportedTypes - .append(getResources().getString(R.string.hdr_format_hlg)); + .append(getResources().getString(R.string.hdr_capability, + getResources().getString(R.string.hdr_format_hlg))); break; case HDR_TYPE_HDR10_PLUS: supportedTypes - .append(getResources().getString(R.string.hdr_format_hdr10plus)); + .append(getResources().getString(R.string.hdr_capability, + getResources().getString(R.string.hdr_format_hdr10plus))); break; } } |