mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-03-10 19:47:40 +01:00
Android: Remove touchscreen check for rumble
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:
parent
b354e343a7
commit
709031bb1d
@ -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();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -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);
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user