From 6c659d58ce11fa331ae391c84053f979902c4b85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Geoffrey=20M=C3=A9tais?= <geoffrey.metais@gmail.com>
Date: Fri, 23 Jun 2017 12:10:12 +0200
Subject: [PATCH] Move "auto_rescan" setting in main setting page

---
 vlc-android/res/values/strings.xml      |  1 +
 vlc-android/res/xml/preferences.xml     | 62 +++++++++++++++----------
 vlc-android/res/xml/preferences_adv.xml |  6 ---
 3 files changed, 38 insertions(+), 31 deletions(-)

diff --git a/vlc-android/res/values/strings.xml b/vlc-android/res/values/strings.xml
index 6da8238ea..d095902fd 100644
--- a/vlc-android/res/values/strings.xml
+++ b/vlc-android/res/values/strings.xml
@@ -438,6 +438,7 @@
     <string name="player_touch_disable_all">Disable all Touch controls</string>
     <string name="tv_ui_title">Android TV interface</string>
     <string name="tv_ui_summary">Change UI to TV adapted theme</string>
+    <string name="medialibrary">Media library</string>
     <string name="medialibrary_directories">Media library folders</string>
 
     <!--Accessibility-->
diff --git a/vlc-android/res/xml/preferences.xml b/vlc-android/res/xml/preferences.xml
index 0d82c0ac8..30bd97d3d 100644
--- a/vlc-android/res/xml/preferences.xml
+++ b/vlc-android/res/xml/preferences.xml
@@ -2,31 +2,43 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     android:title="@string/preferences">
 
-    <PreferenceScreen
-        android:key="directories"
-        android:summary="@string/directories_summary"
-        android:title="@string/medialibrary_directories" />
-
-    <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" />
-
-    <CheckBoxPreference
-        android:defaultValue="true"
-        android:key="playback_history"
-        android:summary="@string/playback_history_summary"
-        android:title="@string/playback_history_title" />
+    <PreferenceCategory android:title="@string/medialibrary" >
+        <PreferenceScreen
+            android:key="directories"
+            android:summary="@string/directories_summary"
+            android:title="@string/medialibrary_directories" />
+
+        <CheckBoxPreference
+            android:defaultValue="true"
+            android:key="auto_rescan"
+            android:summary="@string/auto_rescan_summary"
+            android:title="@string/auto_rescan" />
+    </PreferenceCategory>
+
+    <PreferenceCategory android:title="@string/video_prefs_category" >
+        <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" />
+    </PreferenceCategory>
+
+    <PreferenceCategory android:title="@string/history" >
+        <CheckBoxPreference
+            android:defaultValue="true"
+            android:key="playback_history"
+            android:summary="@string/playback_history_summary"
+            android:title="@string/playback_history_title" />
+    </PreferenceCategory>
 
     <PreferenceCategory android:title="@string/extra_prefs_category" >
         <Preference
diff --git a/vlc-android/res/xml/preferences_adv.xml b/vlc-android/res/xml/preferences_adv.xml
index bed8d2aec..1cf2f9b92 100644
--- a/vlc-android/res/xml/preferences_adv.xml
+++ b/vlc-android/res/xml/preferences_adv.xml
@@ -3,12 +3,6 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     android:title="@string/advanced_prefs_category">
 
-    <CheckBoxPreference
-        android:defaultValue="true"
-        android:key="auto_rescan"
-        android:summary="@string/auto_rescan_summary"
-        android:title="@string/auto_rescan" />
-
     <CheckBoxPreference
         android:defaultValue="false"
         android:key="browser_show_hidden_files"
-- 
GitLab