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

diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index f3915b2c..aa5db948 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -58,21 +58,38 @@
             android:title="@string/user_agent"
             android:entries="@array/user_agent_entries"
             android:entryValues="@array/user_agent_entry_values"
-            android:defaultValue="Default user agent" />
+            android:defaultValue="PrivacyBrowser/1.0"
+            android:icon="@drawable/user_agent" />
 
-        <!-- android:inputType="textVisiblePassword" sets the keyboard to have a dedicated number row.
-          android:imeOptions="flagNoExtractUi" is not set because with the dedicated number row there often isn't room to see the EditText in landscape orientation. -->
+        <!-- android:inputType="textVisiblePassword" sets the keyboard to have a dedicated number row.-->
         <EditTextPreference
             android:key="custom_user_agent"
             android:title="@string/custom_user_agent"
             android:defaultValue="PrivacyBrowser/1.0"
             android:inputType="textVisiblePassword|textMultiLine" />
 
+        <SwitchPreference
+            android:key="block_ads"
+            android:title="@string/block_ads"
+            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"
             android:summary="@string/do_not_track_summary"
-            android:defaultValue="true" />
+            android:defaultValue="false" />
+    </PreferenceCategory>
+
+    <PreferenceCategory
+        android:key="tor"
+        android:title="@string/tor" >
 
         <SwitchPreference
             android:key="proxy_through_orbot"
@@ -80,55 +97,75 @@
             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_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="tor_search_custom_url"
+            android:title="@string/tor_search_custom_url"
+            android:defaultValue=""
+            android:inputType="textUri" />
     </PreferenceCategory>
 
     <PreferenceCategory
-        android:key="search"
+        android:key="search_category"
         android:title="@string/search">
 
         <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:key="search"
+            android:title="@string/search"
+            android:entries="@array/search_entries"
+            android:entryValues="@array/search_entry_values"
             android:defaultValue="https://duckduckgo.com/html/?q=" />
 
-        <!-- android:imeOptions="flagNoExtractUi" is not set because with the the length of the title of the dialog box
-          there often isn't enough space to see the EditText in landscape orientation.
-          android:singleLine="true" is not specified because it is the EditTextPreference default. -->
         <EditTextPreference
-            android:key="javascript_disabled_search_custom_url"
-            android:title="@string/javascript_disabled_search_custom_url"
+            android:key="search_custom_url"
+            android:title="@string/search_custom_url"
             android:defaultValue=""
             android:inputType="textUri" />
+    </PreferenceCategory>
 
-        <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:imeOptions="flagNoExtractUi" is not set because with the the length of the title of the dialog box
-          there often isn't enough space to see the EditText in landscape orientation.
-          android:singleLine="true" is not specified because it is the EditTextPreference default. -->
-        <EditTextPreference
-            android:key="javascript_enabled_search_custom_url"
-            android:title="@string/javascript_enabled_search_custom_url"
-            android:defaultValue=""
-            android:inputType="textUri" />
+    <PreferenceCategory
+        android:key="full_screen"
+        android:title="@string/full_screen">
+
+        <SwitchPreference
+            android:key="enable_full_screen_browsing_mode"
+            android:title="@string/enable_full_screen_browsing_mode"
+            android:summary="@string/enable_full_screen_browsing_mode_summary"
+            android:defaultValue="false" />
+
+        <SwitchPreference
+            android:key="hide_system_bars"
+            android:title="@string/hide_system_bars"
+            android:summary="@string/hide_system_bars_summary"
+            android:defaultValue="false" />
+
+        <SwitchPreference
+            android:key="translucent_navigation_bar"
+            android:title="@string/translucent_navigation_bar"
+            android:summary="@string/translucent_navigation_bar_summary"
+            android:defaultValue="true" />
     </PreferenceCategory>
 
     <PreferenceCategory
         android:key="general"
         android:title="@string/general" >
 
-        <!-- android:imeOptions="flagNoExtractUi" is not set because in special character mode there often isn't enough space to see the EditText in landscape orientation.
-          android:singleLine="true" is not specified because it is the EditTextPreference default. -->
         <EditTextPreference
             android:key="homepage"
-            android:title="@string/homepage_preference"
-            android:defaultValue="https://www.duckduckgo.com"
+            android:title="@string/homepage"
+            android:defaultValue="https://duckduckgo.com"
             android:inputType="textUri" />
 
         <ListPreference
@@ -136,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" />