Merge pull request #197 from lioncash/android-things

Fix misc Android things.
dolphin-emu · Mar 23, 2014 · bf5f485 · bf5f485
2 parents b579491 + 13c780d
commit bf5f485
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/Source/Android/res/values-ja/strings.xml b/Source/Android/res/values-ja/strings.xml
@@ -12,6 +12,7 @@
     <string name="build_revision">ビルドのバージョン</string>
     <string name="supports_gles3">サポートのOpenGL ES 3</string>
     <string name="supports_neon">サポートのNEON</string>
+    <string name="general">一般</string>
     <string name="cpu">CPU</string>
     <string name="gles_two">GLES 2</string>
     <string name="gles_three">GLES 3</string>
@@ -78,6 +79,7 @@
     <string name="wiimote_2">Wiiリモコン2</string>
     <string name="wiimote_3">Wiiリモコン3</string>
     <string name="wiimote_4">Wiiリモコン4</string>
+    <string name="enable_wiimote">Wiiリモコンを有効</string>
     <string name="input_binding">入力バインディング</string>
     <string name="input_binding_descrip">%1$sにバインドするための入力を移動または押してください。</string>
     <!-- Gamecube buttons (May be shared with Wiimote stuff too) -->

diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/emulation/overlay/InputOverlay.java b/Source/Android/src/org/dolphinemu/dolphinemu/emulation/overlay/InputOverlay.java
@@ -94,7 +94,7 @@ public InputOverlay(Context context, AttributeSet attrs)
 	@Override
 	public void draw(Canvas canvas)
 	{
-		super.onDraw(canvas);
+		super.draw(canvas);
 
 		for (InputOverlayDrawableButton button : overlayButtons)
 		{