X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Fxml%2Fpreferences.xml;h=aa5db948b77de1ea6fbdfc8edfe9bf7e9725c2ac;hb=30b6db5cdccb01d98f19b3a6af91d9f8ae1322bf;hp=b978d8f9c1ed42cf6a057ec8a76f4561fd6db8e0;hpb=17174f4ceb49bbdb01e2700b2c4d3b3aa670e18e;p=PrivacyBrowserAndroid.git

diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index b978d8f9..aa5db948 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -58,7 +58,8 @@
             android:title="@string/user_agent"
             android:entries="@array/user_agent_entries"
             android:entryValues="@array/user_agent_entry_values"
-            android:defaultValue="PrivacyBrowser/1.0" />
+            android:defaultValue="PrivacyBrowser/1.0"
+            android:icon="@drawable/user_agent" />
 
         <!-- android:inputType="textVisiblePassword" sets the keyboard to have a dedicated number row.-->
         <EditTextPreference
@@ -73,6 +74,12 @@
             android:summary="@string/block_ads_summary"
             android:defaultValue="true" />
 
+        <SwitchPreference
+            android:key="incognito_mode"
+            android:title="@string/incognito_mode"
+            android:summary="@string/incognito_mode_summary"
+            android:defaultValue="false" />
+
         <SwitchPreference
             android:key="do_not_track"
             android:title="@string/do_not_track"
@@ -81,32 +88,49 @@
     </PreferenceCategory>
 
     <PreferenceCategory
-        android:key="search"
-        android:title="@string/search">
+        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="https://3g2upl4pq6kufc4m.onion"
+            android:inputType="textUri" />
 
         <ListPreference
-            android:key="javascript_disabled_search"
-            android:title="@string/javascript_disabled_search"
-            android:entries="@array/javascript_disabled_search_entries"
-            android:entryValues="@array/javascript_disabled_search_entry_values"
-            android:defaultValue="https://duckduckgo.com/html/?q=" />
+            android:key="tor_search"
+            android:title="@string/tor_search"
+            android:entries="@array/tor_search_entries"
+            android:entryValues="@array/tor_search_entry_values"
+            android:defaultValue="https://3g2upl4pq6kufc4m.onion/html/?q=" />
 
         <EditTextPreference
-            android:key="javascript_disabled_search_custom_url"
-            android:title="@string/javascript_disabled_search_custom_url"
+            android:key="tor_search_custom_url"
+            android:title="@string/tor_search_custom_url"
             android:defaultValue=""
             android:inputType="textUri" />
+    </PreferenceCategory>
+
+    <PreferenceCategory
+        android:key="search_category"
+        android:title="@string/search">
 
         <ListPreference
-            android:key="javascript_enabled_search"
-            android:title="@string/javascript_enabled_search"
-            android:entries="@array/javascript_enabled_search_entries"
-            android:entryValues="@array/javascript_enabled_search_entry_values"
-            android:defaultValue="https://duckduckgo.com/?q=" />
+            android:key="search"
+            android:title="@string/search"
+            android:entries="@array/search_entries"
+            android:entryValues="@array/search_entry_values"
+            android:defaultValue="https://duckduckgo.com/html/?q=" />
 
         <EditTextPreference
-            android:key="javascript_enabled_search_custom_url"
-            android:title="@string/javascript_enabled_search_custom_url"
+            android:key="search_custom_url"
+            android:title="@string/search_custom_url"
             android:defaultValue=""
             android:inputType="textUri" />
     </PreferenceCategory>
@@ -134,49 +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="https://3g2upl4pq6kufc4m.onion"
-            android:inputType="textUri" />
-
-        <ListPreference
-            android:key="tor_javascript_disabled_search"
-            android:title="@string/tor_javascript_disabled_search"
-            android:entries="@array/tor_javascript_disabled_search_entries"
-            android:entryValues="@array/tor_javascript_disabled_search_entry_values"
-            android:defaultValue="https://3g2upl4pq6kufc4m.onion/html/?q=" />
-
-        <EditTextPreference
-            android:key="tor_javascript_disabled_search_custom_url"
-            android:title="@string/tor_javascript_disabled_search_custom_url"
-            android:defaultValue=""
-            android:inputType="textUri" />
-
-        <ListPreference
-            android:key="tor_javascript_enabled_search"
-            android:title="@string/tor_javascript_enabled_search"
-            android:entries="@array/tor_javascript_enabled_search_entries"
-            android:entryValues="@array/tor_javascript_enabled_search_entry_values"
-            android:defaultValue="https://3g2upl4pq6kufc4m.onion/?q=" />
-
-        <EditTextPreference
-            android:key="tor_javascript_enabled_search_custom_url"
-            android:title="@string/tor_javascript_enabled_search_custom_url"
-            android:defaultValue=""
-            android:inputType="textUri" />
-    </PreferenceCategory>
-
     <PreferenceCategory
         android:key="general"
         android:title="@string/general" >
@@ -192,10 +173,11 @@
             android:title="@string/default_font_size"
             android:entries="@array/default_font_size_entries"
             android:entryValues="@array/default_font_size_entry_values"
-            android:defaultValue="100" />
+            android:defaultValue="100"
+            android:icon="@drawable/font_size" />
 
         <SwitchPreference
-            android:key="swipe_to_refresh_enabled"
+            android:key="swipe_to_refresh"
             android:title="@string/swipe_to_refresh_enabled"
             android:summary="@string/swipe_to_refresh_enabled_summary"
             android:defaultValue="false" />