[Android] Cleanup PreferenceVisibilityManager
Nicolas Pomepuy
git at videolan.org
Wed Apr 2 11:59:28 UTC 2025
vlc-android | branch: master | Nicolas Pomepuy <nicolas at videolabs.io> | Wed Apr 2 08:13:50 2025 +0200| [cb75a271cb47a6ef0f4776cd43dfa20db89c2035] | committer: Duncan McNamara
Cleanup PreferenceVisibilityManager
Fixes #3193
> https://code.videolan.org/videolan/vlc-android/commit/cb75a271cb47a6ef0f4776cd43dfa20db89c2035
---
.../vlc/gui/preferences/PreferenceVisibilityManager.kt | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/application/vlc-android/src/org/videolan/vlc/gui/preferences/PreferenceVisibilityManager.kt b/application/vlc-android/src/org/videolan/vlc/gui/preferences/PreferenceVisibilityManager.kt
index e561893632..027ebcdbf9 100644
--- a/application/vlc-android/src/org/videolan/vlc/gui/preferences/PreferenceVisibilityManager.kt
+++ b/application/vlc-android/src/org/videolan/vlc/gui/preferences/PreferenceVisibilityManager.kt
@@ -34,6 +34,8 @@ import org.videolan.tools.AUDIO_DUCKING
import org.videolan.tools.BROWSER_SHOW_HIDDEN_FILES
import org.videolan.tools.KEY_AOUT
import org.videolan.tools.KEY_APP_THEME
+import org.videolan.tools.KEY_QUICK_PLAY
+import org.videolan.tools.KEY_QUICK_PLAY_DEFAULT
import org.videolan.tools.LIST_TITLE_ELLIPSIZE
import org.videolan.tools.PLAYLIST_MODE_AUDIO
import org.videolan.tools.PLAYLIST_MODE_VIDEO
@@ -56,17 +58,19 @@ object PreferenceVisibilityManager {
* @param forTv true it has been called from the TV UI
*/
fun isPreferenceVisible(key:String?, sharedPreferences: SharedPreferences, forTv: Boolean = false) = when (key) {
+ //hidden on TV
+ KEY_QUICK_PLAY_DEFAULT, KEY_QUICK_PLAY, "secondary_display_category", "secondary_display_category_summary", "enable_clone_mode", SAVE_BRIGHTNESS,
+ KEY_APP_THEME, LIST_TITLE_ELLIPSIZE, "enable_headset_detection", "enable_play_on_headset_insertion", "ignore_headset_media_button_presses",
+ "headset_prefs_category" -> !forTv
+ //only on TV
+ TV_FOLDERS_FIRST, BROWSER_SHOW_HIDDEN_FILES, PLAYLIST_MODE_VIDEO, PLAYLIST_MODE_AUDIO -> forTv
+ "show_update" -> !forTv && BuildConfig.DEBUG
AUDIO_DUCKING -> !AndroidUtil.isOOrLater
+ POPUP_FORCE_LEGACY -> AndroidUtil.isOOrLater && !forTv
RESUME_PLAYBACK -> AndroidDevices.isPhone && !forTv
KEY_AOUT -> VlcMigrationHelper.getAudioOutputFromDevice() == VlcMigrationHelper.AudioOutput.ALL
"audio_digital_output" -> sharedPreferences.getString("aout", "0") != "2"
- "secondary_display_category", "secondary_display_category_summary", "enable_clone_mode", SAVE_BRIGHTNESS, KEY_APP_THEME, LIST_TITLE_ELLIPSIZE, "enable_headset_detection", "enable_play_on_headset_insertion", "ignore_headset_media_button_presses", "headset_prefs_category" -> !forTv
- TV_FOLDERS_FIRST, BROWSER_SHOW_HIDDEN_FILES, PLAYLIST_MODE_VIDEO, PLAYLIST_MODE_AUDIO -> forTv
"optional_features" -> FeatureFlag.entries.isNotEmpty()
- "show_update" -> !forTv && BuildConfig.DEBUG
- "quick_play" -> !forTv
- "quick_play_default" -> !forTv
- POPUP_FORCE_LEGACY -> AndroidUtil.isOOrLater && !forTv
else -> true
}
More information about the Android
mailing list