diff options
| author | Lioncash <mathew1800@gmail.com> | 2013-11-15 22:21:50 -0500 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2013-11-15 22:21:50 -0500 |
| commit | 23c84c220f396c53731360dd90acaf278d212422 (patch) | |
| tree | 78c1b397f8774df72ff755e4408ff21a95ca4e41 /Source/Android | |
| parent | 3a13dfdd9b9717a4610908e973a886e115b6ac36 (diff) | |
[Android] Add ability to take screenshots into the emulation menu.
Diffstat (limited to 'Source/Android')
4 files changed, 13 insertions, 2 deletions
diff --git a/Source/Android/res/menu/emuwindow_overlay.xml b/Source/Android/res/menu/emuwindow_overlay.xml index d1c480c284..dc875203e8 100644 --- 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 index f489bc75f4..77db4fee79 100644 --- 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 index 505c493afd..ca7157fd44 100644 --- 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 index 0fdd0c1bee..926b971398 100644 --- 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 final class EmulationActivity extends Activity { switch(item.getItemId()) { + // Screenshot capturing + case R.id.takeScreenshot: + NativeLibrary.SaveScreenShot(); + return true; + // Save state slots case R.id.saveSlot1: NativeLibrary.SaveState(0); |