diff options
| author | LC <mathew1800@gmail.com> | 2020-07-30 21:45:56 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-30 21:45:56 -0400 |
| commit | 0f4cf4a84db93b969181fe302b7f26d2aea40d61 (patch) | |
| tree | 4a63b13484a6783376d0b11759de5f46e4e07d8c /Source/Android/app | |
| parent | 0aaddf8b19324fbcaa38b60de89ce4689b5c3c37 (diff) | |
| parent | 709031bb1d5b1baeeca6f13539dbb9efaf099e82 (diff) | |
Merge pull request #8991 from JosJuice/android-rumble-without-touchscreen
Android: Remove touchscreen check for rumble
Diffstat (limited to 'Source/Android/app')
| -rw-r--r-- | Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java | 7 | ||||
| -rw-r--r-- | Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/Rumble.java | 4 |
2 files changed, 2 insertions, 9 deletions
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 bd57471896..decef06b8f 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 @@ -1177,11 +1177,6 @@ public final class EmulationActivity extends AppCompatActivity .commit(); } - public boolean deviceHasTouchScreen() - { - return mDeviceHasTouchScreen; - } - public String getSelectedTitle() { return mSelectedTitle; @@ -1204,7 +1199,7 @@ public final class EmulationActivity extends AppCompatActivity public void initInputPointer() { - if (deviceHasTouchScreen()) + if (mDeviceHasTouchScreen) mEmulationFragment.initInputPointer(); } } diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/Rumble.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/Rumble.java index 79d2fa9347..aa37a318ef 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/Rumble.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/Rumble.java @@ -22,9 +22,7 @@ public class Rumble { clear(); - if (activity.deviceHasTouchScreen() && - PreferenceManager.getDefaultSharedPreferences(activity) - .getBoolean("phoneRumble", true)) + if (PreferenceManager.getDefaultSharedPreferences(activity).getBoolean("phoneRumble", true)) { setPhoneVibrator(true, activity); } |