diff options
| author | zackhow <zackhow@gmail.com> | 2018-09-02 16:55:22 -0400 |
|---|---|---|
| committer | zackhow <zackhow@gmail.com> | 2018-09-07 08:54:03 -0400 |
| commit | 126ff8dc5f513b01c750cd15e19f9c1e7acf06db (patch) | |
| tree | bb5d1be0d899750aa840f1e3ccd82a294f9c7843 /Source/Android/app/src/main/java | |
| parent | 3405c7d420cb909e00a3140ab2e31b911afe176c (diff) | |
Android: Add rumble for phone
This currently only supports using the internal vibrate on a phone for rumble.
Diffstat (limited to 'Source/Android/app/src/main/java')
| -rw-r--r-- | Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java | 38 | ||||
| -rw-r--r-- | Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java | 17 |
2 files changed, 54 insertions, 1 deletions
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java index 55c8182f88..acfac1e0f4 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java @@ -7,6 +7,11 @@ package org.dolphinemu.dolphinemu; import android.app.AlertDialog; +import android.content.Context; +import android.os.Build; +import android.os.VibrationEffect; +import android.os.Vibrator; +import android.preference.PreferenceManager; import android.view.Surface; import org.dolphinemu.dolphinemu.activities.EmulationActivity; @@ -225,6 +230,39 @@ public final class NativeLibrary */ public static native void onGamePadMoveEvent(String Device, int Axis, float Value); + /** + * Rumble sent from native. Currently only supports phone rumble. + * + * @param padID Ignored for now. Future use would be to pass rumble to a connected controller + * @param state Ignored for now since phone rumble can't just be 'turned' on/off + */ + public static void rumble(int padID, double state) + { + final EmulationActivity emulationActivity = sEmulationActivity.get(); + if (emulationActivity == null) + { + Log.warning("[NativeLibrary] EmulationActivity is null"); + return; + } + + if (PreferenceManager.getDefaultSharedPreferences(emulationActivity) + .getBoolean("phoneRumble", true)) + { + Vibrator vibrator = (Vibrator) emulationActivity.getSystemService(Context.VIBRATOR_SERVICE); + if (vibrator != null && vibrator.hasVibrator()) + { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) + { + vibrator.vibrate(VibrationEffect.createOneShot(100, VibrationEffect.DEFAULT_AMPLITUDE)); + } + else + { + vibrator.vibrate(100); + } + } + } + } + public static native String GetUserSetting(String gameID, String Section, String Key); public static native void SetUserSetting(String gameID, String Section, String Key, String Value); diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java index 221d3ee399..7eb8430935 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java @@ -124,6 +124,7 @@ public final class EmulationActivity extends AppCompatActivity public static final int MENU_ACTION_EXIT = 22; public static final int MENU_ACTION_CHANGE_DISC = 23; public static final int MENU_ACTION_JOYSTICK_REL_CENTER = 24; + public static final int MENU_ACTION_RUMBLE = 25; private static SparseIntArray buttonsActionsMap = new SparseIntArray(); @@ -163,6 +164,7 @@ public final class EmulationActivity extends AppCompatActivity buttonsActionsMap.append(R.id.menu_exit, EmulationActivity.MENU_ACTION_EXIT); buttonsActionsMap.append(R.id.menu_emulation_joystick_rel_center, EmulationActivity.MENU_ACTION_JOYSTICK_REL_CENTER); + buttonsActionsMap.append(R.id.menu_emulation_rumble, EmulationActivity.MENU_ACTION_RUMBLE); } public static void launch(FragmentActivity activity, GameFile gameFile, int position, @@ -473,6 +475,8 @@ public final class EmulationActivity extends AppCompatActivity // Populate the checkbox value for joystick center on touch menu.findItem(R.id.menu_emulation_joystick_rel_center) .setChecked(mPreferences.getBoolean("joystickRelCenter", true)); + menu.findItem(R.id.menu_emulation_rumble) + .setChecked(mPreferences.getBoolean("phoneRumble", true)); return true; } @@ -504,7 +508,11 @@ public final class EmulationActivity extends AppCompatActivity case MENU_ACTION_JOYSTICK_REL_CENTER: item.setChecked(!item.isChecked()); toggleJoystickRelCenter(item.isChecked()); - return; + break; + case MENU_ACTION_RUMBLE: + item.setChecked(!item.isChecked()); + toggleRumble(item.isChecked()); + break; } } @@ -636,6 +644,13 @@ public final class EmulationActivity extends AppCompatActivity editor.commit(); } + private void toggleRumble(boolean state) + { + final SharedPreferences.Editor editor = mPreferences.edit(); + editor.putBoolean("phoneRumble", state); + editor.apply(); + } + private void editControlsPlacement() { |
