mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-08-02 22:29:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Android: Remove touchscreen check for rumble

Browse source 
That a device doesn't have a touchscreen doesn't necessarily mean
that it doesn't support rumble (though it is usually the case).
setPhoneVibrator already contains a check for whether the device
supports rumble, so we can simply remove the touchscreen check.
This commit is contained in:
JosJuice 2020-07-29 17:48:56 +02:00
commit 709031bb1d
2 changed files with 2 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java
View file

@ -1177,11 +1177,6 @@ public final class EmulationActivity extends AppCompatActivity
.commit(); .commit();
} }
public boolean deviceHasTouchScreen()
{
return mDeviceHasTouchScreen;
}
public String getSelectedTitle() public String getSelectedTitle()
{ {
return mSelectedTitle; return mSelectedTitle;
@ -1204,7 +1199,7 @@ public final class EmulationActivity extends AppCompatActivity
public void initInputPointer() public void initInputPointer()
{ {
if (deviceHasTouchScreen()) if (mDeviceHasTouchScreen)
mEmulationFragment.initInputPointer(); mEmulationFragment.initInputPointer();
} }
} }

4
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/Rumble.java
View file

@ -22,9 +22,7 @@ public class Rumble
{ {
clear(); clear();
if (activity.deviceHasTouchScreen() && if (PreferenceManager.getDefaultSharedPreferences(activity).getBoolean("phoneRumble", true))
PreferenceManager.getDefaultSharedPreferences(activity)
.getBoolean("phoneRumble", true))
{ {
setPhoneVibrator(true, activity); setPhoneVibrator(true, activity);
} }