Merge branch 'master' into wii-network

3 files changed, 91 insertions, 0 deletions

diff --git a/Source/Android/res/values-ja/strings.xml b/Source/Android/res/values-ja/strings.xml
index 12594ca2ac..73ef858a00 100644
--- a/Source/Android/res/values-ja/strings.xml
+++ b/Source/Android/res/values-ja/strings.xml
@@ -31,6 +31,9 @@
     <string name="file_clicked">クリックされたファイル： </string>
     
     <!-- Input Config Fragment -->
+    <string name="input_settings">入力設定</string>
+    <string name="input_binding">入力バインディング</string>
+    <string name="input_binding_descrip">このコントロールにバインドするための入力を移動または押してください。</string>
     <string name="button_a">Aボタン</string>
     <string name="button_b">Bボタン</string>
     <string name="button_start">スタートボタン</string>
@@ -115,6 +118,7 @@
     <!-- Miscellaneous -->
     <string name="yes">はい</string>
     <string name="no">いいえ</string>
+    <string name="cancel">キャンセル</string>
     <string name="disabled">無効</string>
     <string name="other">その他</string>
 
diff --git a/Source/Android/res/values/strings.xml b/Source/Android/res/values/strings.xml
index dac787e4bc..1abeb4992d 100644
--- a/Source/Android/res/values/strings.xml
+++ b/Source/Android/res/values/strings.xml
@@ -31,6 +31,9 @@
     <string name="file_clicked">File clicked: </string>
 
     <!-- Input Config Fragment -->
+    <string name="input_settings">Input</string>
+    <string name="input_binding">Input Binding</string>
+    <string name="input_binding_descrip">Press or move an input to bind it to this control.</string>
     <string name="button_a">Button A</string>
     <string name="button_b">Button B</string>
     <string name="button_start">Button Start</string>
@@ -115,6 +118,7 @@
     <!-- Miscellaneous -->
     <string name="yes">Yes</string>
     <string name="no">No</string>
+    <string name="cancel">Cancel</string>
     <string name="disabled">Disabled</string>
     <string name="other">Other</string>
     
diff --git a/Source/Android/res/xml/input_prefs.xml b/Source/Android/res/xml/input_prefs.xml
new file mode 100644
index 0000000000..daddf93e3d
--- /dev/null
+++ b/Source/Android/res/xml/input_prefs.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+
+	    <Preference
+	        android:key="InputA"
+	        android:title="@string/button_a" />
+	
+	    <Preference
+	        android:key="InputB"
+	        android:title="@string/button_b" />
+	
+	    <Preference
+	        android:key="InputX"
+	        android:title="@string/button_x" />
+	
+	    <Preference
+	        android:key="InputY"
+	        android:title="@string/button_y" />
+	
+	    <Preference
+	        android:key="InputZ"
+	        android:title="@string/button_z" />
+	
+	    <Preference
+	        android:key="InputStart"
+	        android:title="@string/button_start" />
+	
+	    <Preference
+	        android:key="DPadUp"
+	        android:title="@string/dpad_up" />
+	
+	    <Preference
+	        android:key="DPadDown"
+	        android:title="@string/dpad_down" />
+	
+	    <Preference
+	           android:key="DPadLeft"
+	           android:title="@string/dpad_left" />
+	
+	    <Preference
+	           android:key="DPadRight"
+	           android:title="@string/dpad_right" />
+	
+	    <Preference
+	        android:key="MainUp"
+	        android:title="@string/main_stick_up" />
+	
+	    <Preference
+	        android:key="MainDown"
+	        android:title="@string/main_stick_down" />
+	
+	    <Preference
+	        android:key="MainLeft"
+	        android:title="@string/main_stick_left" />
+	
+	    <Preference
+	        android:key="MainRight"
+	        android:title="@string/main_stick_right" />
+	
+	    <Preference
+	        android:key="CStickUp"
+	        android:title="@string/c_stick_up" />
+	
+	    <Preference
+	        android:key="CStickDown"
+	        android:title="@string/c_stick_down" />
+	
+	    <Preference
+	        android:key="CStickLeft"
+	        android:title="@string/c_stick_left" />
+	
+	    <Preference
+	        android:key="CStickRight"
+	        android:title="@string/c_stick_right" />
+	
+	    <Preference
+	        android:key="InputL"
+	        android:title="@string/trigger_left" />
+	    
+	    <Preference
+	        android:key="InputR"
+	        android:title="@string/trigger_right" />
+</PreferenceScreen>
\ No newline at end of file