diff options
| author | Jeff Brown <jeffbrown@google.com> | 2015-06-10 19:21:09 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-10 19:21:15 +0000 |
| commit | f8f9088a6def1186038c35ec3319113262825f20 (patch) | |
| tree | ddc50bf2a303371b18689bb41dd6a25f811cca03 /res | |
| parent | 9823f27936d07ef1f7ce0d79eca39c3f053d3e62 (diff) | |
| parent | b18130c0df2d5aa5f0246e392838c451ac29f1b5 (diff) | |
| download | packages_apps_Settings-f8f9088a6def1186038c35ec3319113262825f20.zip packages_apps_Settings-f8f9088a6def1186038c35ec3319113262825f20.tar.gz packages_apps_Settings-f8f9088a6def1186038c35ec3319113262825f20.tar.bz2 | |
Merge "Add simulated 4K display modes." into mnc-dev
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/arrays.xml | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml index 36924ee..23d0582 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -1056,24 +1056,32 @@ <!-- Titles for overlay display devices preference. [CHAR LIMIT=35] --> <string-array name="overlay_display_devices_entries"> <item>None</item> - <item>720x480 mdpi</item> - <item>720x480 mdpi (secure)</item> - <item>1280x720 tvdpi</item> - <item>1280x720 tvdpi (secure)</item> - <item>1920x1080 xhdpi</item> - <item>1920x1080 xhdpi (secure)</item> - <item>1280x720 tvdpi and 1920x1080 xhdpi</item> + <item>480p</item> + <item>480p (secure)</item> + <item>720p</item> + <item>720p (secure)</item> + <item>1080p</item> + <item>1080p (secure)</item> + <item>4K</item> + <item>4K (secure)</item> + <item>4K (upscaled)</item> + <item>4K (upscaled, secure)</item> + <item>720p, 1080p (dual screen)</item> </string-array> <!-- Values for overlay display devices preference. --> <string-array name="overlay_display_devices_values" translatable="false" > <item></item> - <item>720x480/160</item> - <item>720x480/160,secure</item> + <item>720x480/142</item> + <item>720x480/142,secure</item> <item>1280x720/213</item> <item>1280x720/213,secure</item> <item>1920x1080/320</item> <item>1920x1080/320,secure</item> + <item>3840x2160/320</item> + <item>3840x2160/320,secure</item> + <item>1920x1080/320|3840x2160/640</item> + <item>1920x1080/320|3840x2160/640,secure</item> <item>1280x720/213;1920x1080/320</item> </string-array> |