X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Fxml%2Fpreferences.xml;h=3234462a9c1e5e18d2c717be614c5557f24bf827;hp=500fcb86658e2e43c55fa1623beee1c848d1b651;hb=ba4a1c032dbffde044b70c804f9d3c1f1ba7b939;hpb=ca7516a7edb9e06d0f9fe9186513986cd82be716

diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 500fcb86..3234462a 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright © 2016-2019 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2020 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
@@ -158,37 +158,6 @@
             android:defaultValue="true" />
     </PreferenceCategory>
 
-    <PreferenceCategory
-        android:key="tor"
-        android:title="@string/tor" >
-
-        <SwitchPreference
-            android:key="proxy_through_orbot"
-            android:title="@string/proxy_through_orbot"
-            android:summary="@string/proxy_through_orbot_summary"
-            android:defaultValue="false" />
-
-        <EditTextPreference
-            android:key="tor_homepage"
-            android:title="@string/tor_homepage"
-            android:defaultValue="@string/tor_homepage_default_value"
-            android:inputType="textUri" />
-
-        <ListPreference
-            android:key="tor_search"
-            android:title="@string/tor_search"
-            android:entries="@array/tor_search_entries"
-            android:entryValues="@array/tor_search_entry_values"
-            android:defaultValue="@string/tor_search_default_value" />
-
-        <!-- `android:inputType` currently doesn't work with AndroidX. -->
-        <EditTextPreference
-            android:key="tor_search_custom_url"
-            android:title="@string/tor_search_custom_url"
-            android:defaultValue="@string/tor_search_custom_url_default_value"
-            android:inputType="textUri" />
-    </PreferenceCategory>
-
     <PreferenceCategory
         android:key="search_category"
         android:title="@string/search" >
@@ -208,6 +177,24 @@
             android:inputType="textUri" />
     </PreferenceCategory>
 
+    <PreferenceCategory
+        android:key="proxy_category"
+        android:title="@string/proxy" >
+
+        <ListPreference
+            android:key="proxy"
+            android:title="@string/proxy"
+            android:entries="@array/proxy_entries"
+            android:entryValues="@array/proxy_entry_values"
+            android:defaultValue="@string/proxy_default_value" />
+
+        <EditTextPreference
+            android:key="proxy_custom_url"
+            android:title="@string/proxy_custom_url"
+            android:defaultValue="@string/proxy_custom_url_default_value"
+            android:inputType="textUri" />
+    </PreferenceCategory>
+
     <PreferenceCategory
         android:key="full_screen"
         android:title="@string/full_screen" >
@@ -272,6 +259,21 @@
             android:inputType="textUri"
             android:icon="?attr/homepageIcon" />
 
+        <ListPreference
+            android:key="download_location"
+            android:title="@string/download_location"
+            android:entries="@array/download_location_entries"
+            android:entryValues="@array/download_location_entry_values"
+            android:defaultValue="@string/download_location_default_value"
+            android:inputType="textUri"
+            android:icon="?attr/downloadIcon" />
+
+        <EditTextPreference
+            android:key="download_custom_location"
+            android:title="@string/download_custom_location"
+            android:defaultValue="@string/download_custom_location_default_value"
+            android:inputType="textUri" />
+
         <!-- `android:inputType="number"` currently doesn't work with AndroidX. -->
         <EditTextPreference
             android:key="font_size"
@@ -304,12 +306,6 @@
             android:summary="@string/display_additional_app_bar_icons_summary"
             android:defaultValue="false" />
 
-        <SwitchPreference
-            android:key="download_with_external_app"
-            android:title="@string/download_with_external_app"
-            android:summary="@string/download_with_external_app_summary"
-            android:defaultValue="false" />
-
         <SwitchPreference
             android:key="dark_theme"
             android:title="@string/dark_theme"