Merge pull request #4402 from ajay020/integrate-settings-into-single-section

Integrate the settings for file deletion into a single subsection

Author: VishalNehra

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

@@ -851,5 +851,6 @@ You only need to do this once, until the next time you select a new location for
     <string name="trash_bin_retention_bytes_summary">Maximum data (in MBs) trash bin can store</string>
     <string name="trash_bin_cleanup_interval_title">Cleanup interval</string>
     <string name="trash_bin_cleanup_interval_summary">Trigger auto-cleanup interval (hours)</string>
+    <string name="file_deletion">File Deletion</string>
 </resources>
 

app/src/main/res/xml/behavior_prefs.xml

@@ -23,20 +23,6 @@
         app:key="texteditor_newstack"
         app:summary="@string/preference_newstack_summary"
         app:title="@string/preference_newstack_title" />
-    <com.amaze.filemanager.ui.views.preference.CheckBox
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:defaultValue="true"
-        app:key="delete_confirmation"
-        app:summary="@string/preference_delete_confirmation_summary"
-        app:title="@string/preference_delete_confirmation" />
-    <com.amaze.filemanager.ui.views.preference.CheckBox
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:defaultValue="false"
-        app:key="delete_permanently_without_confirmation"
-        app:summary="@string/preference_delete_permanently_without_confirmation_summary"
-        app:title="@string/preference_delete_permanently_without_confirmation" />
     <Preference
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -55,7 +41,7 @@
         app:key="extractpath"
         app:summary="@string/archive_summary"
         app:title="@string/archive_extract_folder"></Preference>
-    <PreferenceCategory android:title="@string/trash_bin">
+    <PreferenceCategory android:title="@string/file_deletion">
         <Preference
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -80,6 +66,17 @@
             app:key="cleanup_interval"
             app:summary="@string/trash_bin_cleanup_interval_summary"
             app:title="@string/trash_bin_cleanup_interval_title"></Preference>
+        <com.amaze.filemanager.ui.views.preference.CheckBox
+            app:defaultValue="true"
+            app:key="delete_confirmation"
+            app:summary="@string/preference_delete_confirmation_summary"
+            app:title="@string/preference_delete_confirmation" />
+
+        <com.amaze.filemanager.ui.views.preference.CheckBox
+            app:defaultValue="false"
+            app:key="delete_permanently_without_confirmation"
+            app:summary="@string/preference_delete_permanently_without_confirmation_summary"
+            app:title="@string/preference_delete_permanently_without_confirmation" />
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/advanced_search">