From f5d51b2061651ef96cbc1f7938cdc195c23d1ade Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Wed, 24 Jun 2020 17:26:58 -0700 Subject: [PATCH] Disable PiP option on Fire OS due to Amazon guidelines --- .../main/java/com/limelight/preferences/StreamSettings.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/limelight/preferences/StreamSettings.java b/app/src/main/java/com/limelight/preferences/StreamSettings.java index 627de6ed..f45c1d47 100644 --- a/app/src/main/java/com/limelight/preferences/StreamSettings.java +++ b/app/src/main/java/com/limelight/preferences/StreamSettings.java @@ -154,9 +154,11 @@ public class StreamSettings extends Activity { } } - // Remove PiP mode on devices pre-Oreo or where the feature is not available (some low RAM devices) + // Remove PiP mode on devices pre-Oreo, where the feature is not available (some low RAM devices), + // and on Fire OS where it violates the Amazon App Store guidelines for some reason. if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O || - !getActivity().getPackageManager().hasSystemFeature("android.software.picture_in_picture")) { + !getActivity().getPackageManager().hasSystemFeature("android.software.picture_in_picture") || + getActivity().getPackageManager().hasSystemFeature("com.amazon.software.fireos")) { PreferenceCategory category = (PreferenceCategory) findPreference("category_ui_settings"); category.removePreference(findPreference("checkbox_enable_pip"));