[Android] Move up video background option and change title

[Geoffrey Métais]

vlc-android | branch: 2.5.x | Geoffrey Métais <geoffrey.metais at gmail.com> | Tue Dec  5 16:35:17 2017 +0100| [f2a9bd94eb7408132901e9334b1c44e2db785efc] | committer: Geoffrey Métais

Move up video background option and change title

(cherry picked from commit 9bbb05a95d87b5d12d39c8e53fc78c01128c0fe8)

> https://code.videolan.org/videolan/vlc-android/commit/f2a9bd94eb7408132901e9334b1c44e2db785efc
---

 vlc-android/res/values/strings.xml  |  2 +-
 vlc-android/res/xml/preferences.xml | 16 +++++++---------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/vlc-android/res/values/strings.xml b/vlc-android/res/values/strings.xml
index 5a5c55b4a..663665b2f 100644
--- a/vlc-android/res/values/strings.xml
+++ b/vlc-android/res/values/strings.xml
@@ -35,7 +35,7 @@
     <string name="play_from_start">Play from start</string>
     <string name="play_as_audio">Play as audio</string>
     <string name="play_as_video">Play as video</string>
-    <string name="video_app_switch_title">Action on application switching</string>
+    <string name="video_app_switch_title">Background/PiP mode</string>
     <string name="video_app_switch_summary">Select VLC behavior when you switch to other application from video playback</string>
     <string name="play_pip_title">Play videos in Picture-in-picture mode</string>
     <string name="play_as_audio_background">Play videos in background</string>
diff --git a/vlc-android/res/xml/preferences.xml b/vlc-android/res/xml/preferences.xml
index 4bc7a0a11..7133616e7 100644
--- a/vlc-android/res/xml/preferences.xml
+++ b/vlc-android/res/xml/preferences.xml
@@ -17,27 +17,25 @@
 
     <PreferenceCategory android:title="@string/video_prefs_category" >
         <ListPreference
+            android:key="video_action_switch"
+            android:defaultValue="0"
+            android:entries="@array/video_app_switch_action_titles"
+            android:entryValues="@array/video_app_switch_action_values"
+            android:summary="@string/video_app_switch_summary"
+            android:title="@string/video_app_switch_title" />
+        <ListPreference
             android:defaultValue="-1"
             android:entries="@array/hardware_acceleration_list"
             android:entryValues="@array/hardware_acceleration_values"
             android:key="hardware_acceleration"
             android:summary="@string/hardware_acceleration_summary"
             android:title="@string/hardware_acceleration" />
-
         <ListPreference
             android:defaultValue="99"
             android:entries="@array/screen_orientation_list"
             android:entryValues="@array/screen_orientation_values"
             android:key="screen_orientation"
             android:title="@string/screen_orientation" />
-
-        <ListPreference
-            android:key="video_action_switch"
-            android:defaultValue="0"
-            android:entries="@array/video_app_switch_action_titles"
-            android:entryValues="@array/video_app_switch_action_values"
-            android:summary="@string/video_app_switch_summary"
-            android:title="@string/video_app_switch_title" />
     </PreferenceCategory>
 
     <PreferenceCategory android:title="@string/history" >