diff --git a/android/app/src/main/java/com/github/stenzek/duckstation/TouchscreenControllerButtonView.java b/android/app/src/main/java/com/github/stenzek/duckstation/TouchscreenControllerButtonView.java index 25f160117..b8f70a8a5 100644 --- a/android/app/src/main/java/com/github/stenzek/duckstation/TouchscreenControllerButtonView.java +++ b/android/app/src/main/java/com/github/stenzek/duckstation/TouchscreenControllerButtonView.java @@ -19,6 +19,8 @@ public final class TouchscreenControllerButtonView extends View { FAST_FORWARD, ANALOG_TOGGLE, OPEN_PAUSE_MENU, + QUICK_LOAD, + QUICK_SAVE } private Drawable mUnpressedDrawable; @@ -149,9 +151,10 @@ public final class TouchscreenControllerButtonView extends View { switch (mHotkey) { - case FAST_FORWARD: + case FAST_FORWARD: { hi.setFastForwardEnabled(mPressed); - break; + } + break; case ANALOG_TOGGLE: { if (!mPressed) @@ -165,6 +168,18 @@ public final class TouchscreenControllerButtonView extends View { } break; + case QUICK_LOAD: { + if (!mPressed) + hi.loadState(false, 0); + } + break; + + case QUICK_SAVE: { + if (!mPressed) + hi.saveState(false, 0); + } + break; + case NONE: default: break; diff --git a/android/app/src/main/java/com/github/stenzek/duckstation/TouchscreenControllerView.java b/android/app/src/main/java/com/github/stenzek/duckstation/TouchscreenControllerView.java index cf597b463..137e0bc75 100644 --- a/android/app/src/main/java/com/github/stenzek/duckstation/TouchscreenControllerView.java +++ b/android/app/src/main/java/com/github/stenzek/duckstation/TouchscreenControllerView.java @@ -328,6 +328,10 @@ public class TouchscreenControllerView extends FrameLayout { TouchscreenControllerButtonView.Hotkey.ANALOG_TOGGLE, false); linkHotkeyButton(mMainView, R.id.controller_button_pause, "OpenPauseMenu", TouchscreenControllerButtonView.Hotkey.OPEN_PAUSE_MENU, true); + linkHotkeyButton(mMainView, R.id.controller_button_quick_load, "QuickLoad", + TouchscreenControllerButtonView.Hotkey.QUICK_LOAD, false); + linkHotkeyButton(mMainView, R.id.controller_button_quick_save, "QuickSave", + TouchscreenControllerButtonView.Hotkey.QUICK_SAVE, false); reloadButtonSettings(); updateOpacity(); diff --git a/android/app/src/main/res/drawable/ic_controller_quick_load_button.xml b/android/app/src/main/res/drawable/ic_controller_quick_load_button.xml new file mode 100644 index 000000000..f4197876c --- /dev/null +++ b/android/app/src/main/res/drawable/ic_controller_quick_load_button.xml @@ -0,0 +1,9 @@ + + + diff --git a/android/app/src/main/res/drawable/ic_controller_quick_save_button.xml b/android/app/src/main/res/drawable/ic_controller_quick_save_button.xml new file mode 100644 index 000000000..2a81bac25 --- /dev/null +++ b/android/app/src/main/res/drawable/ic_controller_quick_save_button.xml @@ -0,0 +1,9 @@ + + + diff --git a/android/app/src/main/res/layout/layout_touchscreen_controller_analog_stick.xml b/android/app/src/main/res/layout/layout_touchscreen_controller_analog_stick.xml index e3530b302..ac7ffb4af 100644 --- a/android/app/src/main/res/layout/layout_touchscreen_controller_analog_stick.xml +++ b/android/app/src/main/res/layout/layout_touchscreen_controller_analog_stick.xml @@ -179,6 +179,28 @@ app:pressedDrawable="@drawable/ic_controller_pause_button" app:unpressedDrawable="@drawable/ic_controller_pause_button" /> + + + + + + + + + + + + + + + +