[Android] Add ability to take screenshots into the emulation menu.

dolphin-emu · Nov 16, 2013 · 23c84c2 · 23c84c2
1 parent 3a13dfd
commit 23c84c2
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 2 deletions.
diff --git a/Source/Android/res/menu/emuwindow_overlay.xml b/Source/Android/res/menu/emuwindow_overlay.xml
@@ -1,7 +1,11 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item
-        android:id="@+id/saveStateRoot"
+        android:id="@+id/takeScreenshot"
         android:showAsAction="ifRoom"
+        android:title="@string/overlay_screenshot"/>
+    <item
+        android:id="@+id/saveStateRoot"
+        android:showAsAction="never"
         android:title="@string/overlay_savestate">
         <menu>
             <item android:id="@+id/saveSlot1"
@@ -23,7 +27,7 @@
 
     <item
         android:id="@+id/loadStateRoot"
-        android:showAsAction="ifRoom"
+        android:showAsAction="never"
         android:title="@string/overlay_loadstate">
         <menu>
             <item android:id="@+id/loadSlot1"

diff --git a/Source/Android/res/values-ja/strings.xml b/Source/Android/res/values-ja/strings.xml
@@ -34,6 +34,7 @@
     <string name="file_clicked">クリックされたファイル： %1$s</string>
 
     <!-- Emulation Window Overlay -->
+    <string name="overlay_screenshot">スクリーンショットを撮る</string>
     <string name="overlay_savestate">ステートセーブ</string>
     <string name="overlay_loadstate">ステートロード</string>
     <string name="overlay_exit_emulation">終了</string>

diff --git a/Source/Android/res/values/strings.xml b/Source/Android/res/values/strings.xml
@@ -34,6 +34,7 @@
     <string name="file_clicked">File clicked: %1$s</string>
 
     <!-- Emulation Overlay -->
+    <string name="overlay_screenshot">Take Screenshot</string>
     <string name="overlay_savestate">Save State</string>
     <string name="overlay_loadstate">Load State</string>
     <string name="overlay_exit_emulation">Exit</string>

diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/emulation/EmulationActivity.java b/Source/Android/src/org/dolphinemu/dolphinemu/emulation/EmulationActivity.java
@@ -175,6 +175,11 @@ public boolean onMenuItemSelected(int itemId, MenuItem item)
 	{
 		switch(item.getItemId())
 		{
+			// Screenshot capturing
+			case R.id.takeScreenshot:
+				NativeLibrary.SaveScreenShot();
+				return true;
+
 			// Save state slots
 			case R.id.saveSlot1:
 				NativeLibrary.SaveState(0);