[Android] Move the save brightness setting in the video controls settings

[Nicolas Pomepuy]

vlc-android | branch: master | Nicolas Pomepuy <nicolas at videolabs.io> | Thu Feb 20 09:40:17 2025 +0100| [d6a381efb8419a3f9242683395fc630e5cc43e4d] | committer: Nicolas Pomepuy

Move the save brightness setting in the video controls settings

Fixes #3022

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

 .../org/videolan/vlc/gui/preferences/PreferencesVideoUITest.kt     | 6 ------
 application/vlc-android/res/xml/preferences_video.xml              | 6 ------
 application/vlc-android/res/xml/preferences_video_controls.xml     | 7 +++++++
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/application/app/src/androidTest/java/org/videolan/vlc/gui/preferences/PreferencesVideoUITest.kt b/application/app/src/androidTest/java/org/videolan/vlc/gui/preferences/PreferencesVideoUITest.kt
index 3e9d15d8f0..042377d846 100644
--- a/application/app/src/androidTest/java/org/videolan/vlc/gui/preferences/PreferencesVideoUITest.kt
+++ b/application/app/src/androidTest/java/org/videolan/vlc/gui/preferences/PreferencesVideoUITest.kt
@@ -25,12 +25,6 @@ class PreferencesVideoUITest: BasePreferenceUITest() {
                 .perform(click())
     }
 
-    @Test
-    fun checkPersistentBrightnessSetting() {
-        val key = SAVE_BRIGHTNESS
-        checkToggleWorks(key, settings, default = false)
-    }
-
     @Test
     fun checkAudioIndividualDelaySetting() {
         val key = "save_individual_audio_delay"
diff --git a/application/vlc-android/res/xml/preferences_video.xml b/application/vlc-android/res/xml/preferences_video.xml
index 19034431d2..a16fa8542b 100644
--- a/application/vlc-android/res/xml/preferences_video.xml
+++ b/application/vlc-android/res/xml/preferences_video.xml
@@ -10,12 +10,6 @@
             android:key="save_individual_audio_delay"
             android:summary="@string/save_audiodelay_summary"
             android:title="@string/save_audiodelay_title"/>
-    <CheckBoxPreference
-            app:singleLineTitle="false"
-            android:defaultValue="false"
-            android:key="save_brightness"
-            android:summary="@string/save_brightness_summary"
-            android:title="@string/save_brightness_title"/>
     <CheckBoxPreference
             app:singleLineTitle="false"
             android:defaultValue="false"
diff --git a/application/vlc-android/res/xml/preferences_video_controls.xml b/application/vlc-android/res/xml/preferences_video_controls.xml
index f59c2fd8f6..3f2e0edd45 100644
--- a/application/vlc-android/res/xml/preferences_video_controls.xml
+++ b/application/vlc-android/res/xml/preferences_video_controls.xml
@@ -29,6 +29,13 @@
                 android:title="@string/enable_brightness_gesture_title"
                 app:iconSpaceReserved="false"
                 app:singleLineTitle="false" />
+        <CheckBoxPreference
+                app:singleLineTitle="false"
+                android:defaultValue="false"
+                android:key="save_brightness"
+                app:iconSpaceReserved="false"
+                android:summary="@string/save_brightness_summary"
+                android:title="@string/save_brightness_title"/>
         <CheckBoxPreference
                 android:defaultValue="true"
                 android:key="enable_swipe_seek"