From 7c6b00663125e0adbe2fc41c4d27739752d822bb Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Wed, 10 Jun 2020 21:15:21 -0700 Subject: [PATCH] Remove OSC rumble option if a vibrator isn't present --- .../java/com/limelight/preferences/StreamSettings.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/limelight/preferences/StreamSettings.java b/app/src/main/java/com/limelight/preferences/StreamSettings.java index 7e78a928..610ed098 100644 --- a/app/src/main/java/com/limelight/preferences/StreamSettings.java +++ b/app/src/main/java/com/limelight/preferences/StreamSettings.java @@ -164,11 +164,17 @@ public class StreamSettings extends Activity { category.removePreference(findPreference("checkbox_enable_pip")); } - // Remove the "emulate rumble support with vibration" checkbox if the device can't vibrate + // Remove the vibration options if the device can't vibrate if (!((Vibrator)getActivity().getSystemService(Context.VIBRATOR_SERVICE)).hasVibrator()) { PreferenceCategory category = (PreferenceCategory) findPreference("category_input_settings"); category.removePreference(findPreference("checkbox_vibrate_fallback")); + + // The entire OSC category may have already been removed by the touchscreen check above + category = (PreferenceCategory) findPreference("category_onscreen_controls"); + if (category != null) { + category.removePreference(findPreference("checkbox_vibrate_osc")); + } } int maxSupportedFps = 0;