[Android] Video control settings reorganisation

[Nicolas Pomepuy]

vlc-android | branch: master | Nicolas Pomepuy <nicolas at videolabs.io> | Mon Jul  8 13:05:56 2024 +0200| [b5d4045f39c88550db6ebc2e62e8ba9d06b12ff4] | committer: Duncan McNamara

Video control settings reorganisation

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

 .../resources/src/main/res/values/strings.xml      |  2 +-
 .../res/xml/preferences_video_controls.xml         | 47 ++++++++++++----------
 2 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/application/resources/src/main/res/values/strings.xml b/application/resources/src/main/res/values/strings.xml
index 2b51af5ba2..e9585d72fb 100644
--- a/application/resources/src/main/res/values/strings.xml
+++ b/application/resources/src/main/res/values/strings.xml
@@ -385,7 +385,7 @@
     <string name="albums_show_track_numbers">Show track numbers</string>
     <string name="enable_video_screenshot">Take a screenshot</string>
     <string name="enable_tap_and_hold_fastplay_title">Enable Fastplay</string>
-    <string name="enable_tap_and_hold_fastplay_summary">Tap and hold to increase play speed</string>
+    <string name="enable_tap_and_hold_fastplay_summary">Tap and hold to increase the playback speed</string>
     <string name="fastplay_speed_title">Fastplay speed</string>
     <string name="fastplay_title">Playing at %sx</string>
     <string name="fastplay_subtitle">Release to stop</string>
diff --git a/application/vlc-android/res/xml/preferences_video_controls.xml b/application/vlc-android/res/xml/preferences_video_controls.xml
index 37667c3e41..f59c2fd8f6 100644
--- a/application/vlc-android/res/xml/preferences_video_controls.xml
+++ b/application/vlc-android/res/xml/preferences_video_controls.xml
@@ -13,7 +13,8 @@
             app:iconSpaceReserved="false"
             app:singleLineTitle="false" />
 
-    <PreferenceCategory android:title="@string/gestures">
+    <PreferenceCategory android:title="@string/gestures"
+            app:iconSpaceReserved="false">
         <CheckBoxPreference
                 android:defaultValue="true"
                 android:key="enable_volume_gesture"
@@ -28,6 +29,13 @@
                 android:title="@string/enable_brightness_gesture_title"
                 app:iconSpaceReserved="false"
                 app:singleLineTitle="false" />
+        <CheckBoxPreference
+                android:defaultValue="true"
+                android:key="enable_swipe_seek"
+                android:summary="@string/enable_swipe_seek_summary"
+                android:title="@string/enable_swipe_seek_title"
+                app:iconSpaceReserved="false"
+                app:singleLineTitle="false" />
         <CheckBoxPreference
                 android:defaultValue="true"
                 android:key="enable_scale_gesture"
@@ -42,6 +50,12 @@
                 android:title="@string/enable_double_tap_seek_title"
                 app:iconSpaceReserved="false"
                 app:singleLineTitle="false" />
+        <org.videolan.vlc.gui.view.NumberPickerPreference
+                android:defaultValue="10"
+                android:dependency="enable_double_tap_seek"
+                app:iconSpaceReserved="false"
+                app:key="video_double_tap_jump_delay"
+                app:title="@string/video_double_tap_jump_delay" />
         <CheckBoxPreference
                 android:defaultValue="true"
                 android:key="enable_double_tap_play"
@@ -49,26 +63,7 @@
                 android:title="@string/enable_double_tap_play_title"
                 app:iconSpaceReserved="false"
                 app:singleLineTitle="false" />
-        <CheckBoxPreference
-                android:defaultValue="true"
-                android:key="enable_swipe_seek"
-                android:summary="@string/enable_swipe_seek_summary"
-                android:title="@string/enable_swipe_seek_title"
-                app:iconSpaceReserved="false"
-                app:singleLineTitle="false" />
-        <CheckBoxPreference
-                android:defaultValue="false"
-                android:key="enable_fastplay"
-                android:summary="@string/enable_tap_and_hold_fastplay_summary"
-                android:title="@string/enable_tap_and_hold_fastplay_title"
-                app:iconSpaceReserved="false"
-                app:singleLineTitle="false" />
-        <org.videolan.vlc.gui.view.NumberPickerPreference
-                android:defaultValue="10"
-                android:dependency="enable_double_tap_seek"
-                app:iconSpaceReserved="false"
-                app:key="video_double_tap_jump_delay"
-                app:title="@string/video_double_tap_jump_delay" />
+
         <ListPreference
                 android:defaultValue="0"
                 android:entries="@array/video_screenshot"
@@ -78,6 +73,13 @@
                 android:title="@string/enable_video_screenshot"
                 app:iconSpaceReserved="false"
                 app:singleLineTitle="false" />
+        <CheckBoxPreference
+                android:defaultValue="false"
+                android:key="enable_fastplay"
+                android:summary="@string/enable_tap_and_hold_fastplay_summary"
+                android:title="@string/enable_tap_and_hold_fastplay_title"
+                app:iconSpaceReserved="false"
+                app:singleLineTitle="false" />
         <ListPreference
                 android:defaultValue="2"
                 android:dependency="enable_fastplay"
@@ -91,7 +93,8 @@
 
     </PreferenceCategory>
 
-    <PreferenceCategory android:title="@string/player_controls">
+    <PreferenceCategory android:title="@string/player_controls"
+            app:iconSpaceReserved="false">
         <CheckBoxPreference
                 android:defaultValue="false"
                 android:key="enable_seek_buttons"