ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8991 from JosJuice/android-rumble-without-touchscreen 

Android: Remove touchscreen check for rumble
This commit is contained in:
LC 2020-07-30 21:45:56 -04:00 committed by GitHub
parent 0aaddf8b19 709031bb1d
commit 0f4cf4a84d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 9 deletions
Show Stats 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();
}
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();
}
}

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

@ -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);
}