diff options
| author | Lioncash <mathew1800@gmail.com> | 2013-10-26 00:55:07 -0400 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2013-10-26 00:55:07 -0400 |
| commit | 8d71a83ae5cecc8474f97ccf240a13868af0d5a1 (patch) | |
| tree | 65aafd0586361eca61cf208ea8adb42af922c380 /Source/Android | |
| parent | 77eb9ce725dc9a3f17394318356bcde39562169e (diff) | |
[Android] Fix the super-mature string that was a placeholder for the title for the overlay configuration setting.
Also fix a NullPointerException possibility. Fixed it by giving the PreferenceScreen a title.
Diffstat (limited to 'Source/Android')
| -rw-r--r-- | Source/Android/res/values-ja/strings.xml | 2 | ||||
| -rw-r--r-- | Source/Android/res/values/strings.xml | 2 | ||||
| -rw-r--r-- | Source/Android/res/xml/input_prefs.xml | 7 |
3 files changed, 9 insertions, 2 deletions
diff --git a/Source/Android/res/values-ja/strings.xml b/Source/Android/res/values-ja/strings.xml index bab2d74b0a..ee3bb8d3e7 100644 --- a/Source/Android/res/values-ja/strings.xml +++ b/Source/Android/res/values-ja/strings.xml @@ -43,6 +43,8 @@ <!-- Input Config Fragment --> <string name="input_settings">入力</string> + <string name="input_overlay_layout">入力オーバーレイレイアウト</string> + <string name="input_overlay_layout_desc">入力オーバーレイのためのボタンのレイアウト。</string> <string name="gamecube_bindings">ゲームキューブの入力バインディング</string> <string name="input_binding">入力バインディング</string> <string name="input_binding_descrip">%1$sにバインドするための入力を移動または押してください。</string> diff --git a/Source/Android/res/values/strings.xml b/Source/Android/res/values/strings.xml index 6c26d8828c..29e5a67b30 100644 --- a/Source/Android/res/values/strings.xml +++ b/Source/Android/res/values/strings.xml @@ -43,6 +43,8 @@ <!-- Input Config Fragment --> <string name="input_settings">Input</string> + <string name="input_overlay_layout">Input Overlay Layout</string> + <string name="input_overlay_layout_desc">Button layout for the input overlay.</string> <string name="gamecube_bindings">Gamecube Input Bindings</string> <string name="input_binding">Input Binding</string> <string name="input_binding_descrip">Press or move an input to bind it to %1$s.</string> diff --git a/Source/Android/res/xml/input_prefs.xml b/Source/Android/res/xml/input_prefs.xml index 5dc15ac75e..afd32b476b 100644 --- a/Source/Android/res/xml/input_prefs.xml +++ b/Source/Android/res/xml/input_prefs.xml @@ -5,9 +5,12 @@ <Preference android:key="inputOverlayConfigPref" - android:title="Butts"/> + android:summary="@string/input_overlay_layout_desc" + android:title="@string/input_overlay_layout"/> - <PreferenceScreen android:title="@string/gamecube_bindings"> + <PreferenceScreen + android:key="gamecube_bindings" + android:title="@string/gamecube_bindings"> <Preference android:key="InputA" android:title="@string/button_a" /> |