Simplify resources.

Author: Isira-Seneviratne

app/src/main/java/org/schabi/newpipe/settings/VideoAudioSettingsFragment.java

@@ -22,13 +22,13 @@
 
 public class VideoAudioSettingsFragment extends BasePreferenceFragment {
     private final SharedPreferences.OnSharedPreferenceChangeListener listener =
-            (sharedPreferences, s) -> {
+            (sharedPreferences, key) -> {
                 // on M and above, if user chooses to minimise to popup player on exit
                 // and the app doesn't have display over other apps permission,
                 // show a snackbar to let the user give permission
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M
-                        && s.equals(getString(R.string.minimize_on_exit_key))) {
-                    final String newSetting = sharedPreferences.getString(s, null);
+                        && key.equals(getString(R.string.minimize_on_exit_key))) {
+                    final String newSetting = sharedPreferences.getString(key, null);
                     if (newSetting != null
                             && newSetting.equals(getString(R.string.minimize_on_exit_popup_key))
                             && !Settings.canDrawOverlays(getContext())) {
@@ -39,7 +39,7 @@ public class VideoAudioSettingsFragment extends BasePreferenceFragment {
                                         view -> checkSystemAlertWindowPermission(getContext()))
                                 .show();
                     }
-                } else if (s.equals(getString(R.string.use_inexact_seek_key))) {
+                } else if (key.equals(getString(R.string.use_inexact_seek_key))) {
                     updateSeekOptions();
                 }
             };
@@ -50,13 +50,15 @@ public void onCreatePreferences(final Bundle savedInstanceState, final String ro
 
         updateSeekOptions();
 
-        // PiP is unavailable on Android Go devices, so disable the popup setting on those devices.
-        final PackageManager packageManager = requireContext().getPackageManager();
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N
-                && !packageManager.hasSystemFeature(PackageManager.FEATURE_PICTURE_IN_PICTURE)) {
-            final ListPreference popupConfig =
-                    findPreference(getString(R.string.popup_configuration_key));
-            if (popupConfig != null) {
+        final var popupConfig = findPreference(getString(R.string.popup_configuration_key));
+        if (popupConfig != null) {
+            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
+                // PiP was introduced in Android Nougat.
+                popupConfig.setVisible(false);
+            } else if (!requireContext().getPackageManager()
+                    .hasSystemFeature(PackageManager.FEATURE_PICTURE_IN_PICTURE)) {
+                // PiP is disabled on Android Go devices, so disable the popup setting on those
+                // devices.
                 popupConfig.setEnabled(false);
                 popupConfig.setSummary(getString(R.string.pip_unavailable));
             }

app/src/main/res/values-v24/settings_keys.xml

@@ -1270,7 +1270,6 @@
     </string-array>
 
     <string name="tablet_mode_key">tablet_mode</string>
-
     <string name="tablet_mode_auto_key">auto</string>
     <string name="tablet_mode_on_key">on</string>
     <string name="tablet_mode_off_key">off</string>
@@ -1285,6 +1284,18 @@
         <item>@string/off</item>
     </string-array>
 
+    <string name="popup_configuration_key">popup_configuration</string>
+    <string name="popup_mode_pip">pip</string>
+    <string name="popup_mode_legacy">legacy</string>
+    <string-array name="popup_mode_values">
+        <item>@string/popup_mode_pip</item>
+        <item>@string/popup_mode_legacy</item>
+    </string-array>
+    <string-array name="popup_mode_description">
+        <item>@string/pip</item>
+        <item>@string/legacy</item>
+    </string-array>
+
     <string name="recaptcha_cookies_key">recaptcha_cookies_key</string>
 
     <string name="enable_streams_notifications">enable_streams_notifications</string>

app/src/main/res/values-v24/strings.xml

@@ -145,6 +145,8 @@
     <string name="settings_category_updates_title">Updates</string>
     <string name="settings_category_player_notification_title">Player notification</string>
     <string name="settings_category_player_notification_summary">Configure current playing stream notification</string>
+    <string name="settings_category_player_popup_title">Popup player mode</string>
+    <string name="settings_category_player_popup_summary">Configure popup player mode</string>
     <string name="background_player_playing_toast">Playing in background</string>
     <string name="popup_playing_toast">Playing in popup mode</string>
     <string name="content">Content</string>
@@ -545,6 +547,11 @@
     <string name="list">List</string>
     <string name="grid">Grid</string>
     <string name="auto">Auto</string>
+    <!-- Popup configuration -->
+    <string name="popup_mode">Popup mode</string>
+    <string name="pip">Picture-in-picture</string>
+    <string name="legacy">Original</string>
+    <string name="pip_unavailable">Not configurable on Android Go devices</string>
     <!-- Seekbar Preview Thumbnail-->
     <string name="seekbar_preview_thumbnail_title">Seekbar thumbnail preview</string>
     <string name="high_quality_larger">High quality (larger)</string>

app/src/main/res/values/settings_keys.xml

@@ -140,6 +140,16 @@
             app:singleLineTitle="false"
             app:iconSpaceReserved="false" />
 
+        <ListPreference
+            android:defaultValue="@string/popup_mode_legacy"
+            android:entries="@array/popup_mode_description"
+            android:entryValues="@array/popup_mode_values"
+            android:key="@string/popup_configuration_key"
+            android:summary="%s"
+            android:title="@string/settings_category_player_popup_title"
+            app:iconSpaceReserved="false"
+            app:singleLineTitle="false" />
+
         <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="@string/start_main_player_fullscreen_key"