X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Fxml%2Fpreferences.xml;h=2263b0c4780551667884785b01ace6e9d02fdbf0;hp=f6acd2575d2dbebf04e5dac6da15010a06d9ba41;hb=f82135d919d64d4909c37c79a18e14ceba802579;hpb=87a7789309364ec0802a460cf4f6e79f8a01ee4a

diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index f6acd257..2263b0c4 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 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
@@ -58,65 +58,115 @@
             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="false" />
     </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: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. -->
+            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: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. -->
+            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:icon="@drawable/search_enabled" />
+
         <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>
 
+    <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
@@ -124,13 +174,14 @@
             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="true" />
+            android:defaultValue="false" />
 
         <SwitchPreference
             android:key="display_additional_app_bar_icons"