diff --git a/app/src/androidTest/java/de/test/antennapod/ui/PreferencesTest.java b/app/src/androidTest/java/de/test/antennapod/ui/PreferencesTest.java index 3a74a36a3..de2315a0c 100644 --- a/app/src/androidTest/java/de/test/antennapod/ui/PreferencesTest.java +++ b/app/src/androidTest/java/de/test/antennapod/ui/PreferencesTest.java @@ -69,6 +69,8 @@ public class PreferencesTest { @Test public void testEnablePersistentPlaybackControls() { + // Preference is hidden on Android 11+ where the system controls notification persistence. + assumeTrue(Build.VERSION.SDK_INT < Build.VERSION_CODES.R); final boolean persistNotify = UserPreferences.isPersistNotify(); clickPreference(R.string.user_interface_label); clickPreference(R.string.pref_persistNotify_title); diff --git a/app/src/main/java/de/danoeh/antennapod/ui/screen/preferences/UserInterfacePreferencesFragment.java b/app/src/main/java/de/danoeh/antennapod/ui/screen/preferences/UserInterfacePreferencesFragment.java index 1cd39f795..c36ebaeb4 100644 --- a/app/src/main/java/de/danoeh/antennapod/ui/screen/preferences/UserInterfacePreferencesFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/ui/screen/preferences/UserInterfacePreferencesFragment.java @@ -97,6 +97,10 @@ public class UserInterfacePreferencesFragment extends AnimatedPreferenceFragment findPreference(UserPreferences.PREF_EXPANDED_NOTIFICATION).setVisible(false); } + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) { + findPreference(UserPreferences.PREF_PERSISTENT_NOTIFICATION).setVisible(false); + } + findPreference(UserPreferences.PREF_BOTTOM_NAVIGATION).setOnPreferenceChangeListener((preference, newValue) -> { if (newValue instanceof Boolean && !(Boolean) newValue) { new MaterialAlertDialogBuilder(getContext()) diff --git a/storage/preferences/src/main/java/de/danoeh/antennapod/storage/preferences/UserPreferences.java b/storage/preferences/src/main/java/de/danoeh/antennapod/storage/preferences/UserPreferences.java index 3e43bbce8..7b0b7aa2f 100644 --- a/storage/preferences/src/main/java/de/danoeh/antennapod/storage/preferences/UserPreferences.java +++ b/storage/preferences/src/main/java/de/danoeh/antennapod/storage/preferences/UserPreferences.java @@ -54,7 +54,7 @@ public abstract class UserPreferences { public static final String PREF_EXPANDED_NOTIFICATION = "prefExpandNotify"; public static final String PREF_USE_EPISODE_COVER = "prefEpisodeCover"; public static final String PREF_SHOW_TIME_LEFT = "showTimeLeft"; - private static final String PREF_PERSISTENT_NOTIFICATION = "prefPersistNotify"; + public static final String PREF_PERSISTENT_NOTIFICATION = "prefPersistNotify"; public static final String PREF_FULL_NOTIFICATION_BUTTONS = "prefFullNotificationButtons"; private static final String PREF_SHOW_DOWNLOAD_REPORT = "prefShowDownloadReport"; public static final String PREF_DEFAULT_PAGE = "prefDefaultPage";