diff options
| author | Leo Lam <leolino.lam@gmail.com> | 2017-11-03 13:46:40 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-03 13:46:40 +0100 |
| commit | a58df9fe3dfd7771d0641ef93f3145f26737b6e2 (patch) | |
| tree | 11eb556b5631f715da2eaeaaf4d0ab5ae8da591c /Source/Android/app/src | |
| parent | 423cde2b9c1b3116ee66cd55757d1578afd1cc16 (diff) | |
| parent | 2d3dd5ede73b698aad757f88d5ad95fd95a44918 (diff) | |
Merge pull request #6163 from JosJuice/simple-ini-ir
Revert "Convert to/from old EFB scale numbering"
Diffstat (limited to 'Source/Android/app/src')
| -rw-r--r-- | Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/SettingsFile.java | 2 | ||||
| -rw-r--r-- | Source/Android/app/src/main/res/values/arrays.xml | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/SettingsFile.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/SettingsFile.java index dd4bbdfb66..4ad03c4509 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/SettingsFile.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/SettingsFile.java @@ -82,7 +82,7 @@ public final class SettingsFile public static final String KEY_AUDIO_STRETCH = "AudioStretch"; public static final String KEY_SHOW_FPS = "ShowFPS"; - public static final String KEY_INTERNAL_RES = "EFBScale"; + public static final String KEY_INTERNAL_RES = "InternalResolution"; public static final String KEY_FSAA = "MSAA"; public static final String KEY_ANISOTROPY = "MaxAnisotropy"; public static final String KEY_POST_SHADER = "PostProcessingShader"; diff --git a/Source/Android/app/src/main/res/values/arrays.xml b/Source/Android/app/src/main/res/values/arrays.xml index aa5d87486e..ec9b2cf30f 100644 --- a/Source/Android/app/src/main/res/values/arrays.xml +++ b/Source/Android/app/src/main/res/values/arrays.xml @@ -111,12 +111,12 @@ <item>6x Native (3840x3168) for 4K</item> </string-array> <integer-array name="internalResolutionValues" translatable="false"> + <item>1</item> <item>2</item> + <item>3</item> <item>4</item> + <item>5</item> <item>6</item> - <item>7</item> - <item>8</item> - <item>9</item> </integer-array> <!-- FSAA Preference --> |