ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #197 from lioncash/android-things 

Fix misc Android things.
This commit is contained in:
Ryan Houdek 2014-03-22 21:45:22 -05:00
parent b57949131d 13c780d6a7
commit bf5f485a2c
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Android/res/values-ja/strings.xml
View File

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

2
Source/Android/src/org/dolphinemu/dolphinemu/emulation/overlay/InputOverlay.java
View File

@ -94,7 +94,7 @@ public final class InputOverlay extends SurfaceView implements OnTouchListener
@Override @Override
public void draw(Canvas canvas) public void draw(Canvas canvas)
{ {
super.onDraw(canvas); super.draw(canvas);
for (InputOverlayDrawableButton button : overlayButtons) for (InputOverlayDrawableButton button : overlayButtons)
{ {