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

…reen Android: Remove touchscreen check for rumble
dolphin-emu · Jul 31, 2020 · 0f4cf4a · 0f4cf4a
2 parents 0aaddf8 + 709031b
commit 0f4cf4a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 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
@@ -1177,11 +1177,6 @@ private void showSubMenu(SaveLoadStateFragment.SaveOrLoad saveOrLoad)
             .commit();
   }
 
-  public boolean deviceHasTouchScreen()
-  {
-    return mDeviceHasTouchScreen;
-  }
-
   public String getSelectedTitle()
   {
     return mSelectedTitle;
@@ -1204,7 +1199,7 @@ public Settings getSettings()
 
   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
@@ -22,9 +22,7 @@ public static void initRumble(EmulationActivity activity)
   {
     clear();
 
-    if (activity.deviceHasTouchScreen() &&
-            PreferenceManager.getDefaultSharedPreferences(activity)
-                    .getBoolean("phoneRumble", true))
+    if (PreferenceManager.getDefaultSharedPreferences(activity).getBoolean("phoneRumble", true))
     {
       setPhoneVibrator(true, activity);
     }