X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Fxml%2Fpreferences.xml;h=194aa4d3dd3307b9fdd8f3925eedb489e3cdd7cf;hb=ae5cf6844097d6e1d24e628149de3109eac5a120;hp=e2ccb7dce3ac062c3a681290fb489df29246baf4;hpb=4e087dd6a40ef24878a308c0c9d3102d8b1acdd7;p=PrivacyBrowserAndroid.git

diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index e2ccb7dc..194aa4d3 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>.
 
@@ -20,8 +20,8 @@
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
     <PreferenceCategory
-        android:key="privacy_settings"
-        android:title="@string/privacy_settings" >
+        android:key="privacy"
+        android:title="@string/privacy" >
 
         <SwitchPreference
             android:key="javascript_enabled"
@@ -29,6 +29,18 @@
             android:summary="@string/javascript_preference_summary"
             android:defaultValue="false" />
 
+        <SwitchPreference
+            android:key="first_party_cookies_enabled"
+            android:title="@string/first_party_cookies_preference"
+            android:summary="@string/first_party_cookies_preference_summary"
+            android:defaultValue="false" />
+
+        <SwitchPreference
+            android:key="third_party_cookies_enabled"
+            android:title="@string/third_party_cookies_preference"
+            android:summary="@string/third_party_cookies_summary"
+            android:defaultValue="false" />
+
         <SwitchPreference
             android:key="dom_storage_enabled"
             android:title="@string/dom_storage_preference"
@@ -36,21 +48,146 @@
             android:defaultValue="false" />
 
         <SwitchPreference
-            android:key="cookies_enabled"
-            android:title="@string/cookies_preference"
-            android:summary="@string/cookies_preference_summary"
+            android:key="save_form_data_enabled"
+            android:title="@string/save_form_data_preference"
+            android:summary="@string/save_form_data_preference_summary"
+            android:defaultValue="false" />
+
+        <ListPreference
+            android:key="user_agent"
+            android:title="@string/user_agent"
+            android:entries="@array/user_agent_entries"
+            android:entryValues="@array/user_agent_entry_values"
+            android:defaultValue="PrivacyBrowser/1.0"
+            android:icon="@drawable/user_agent" />
+
+        <!-- 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="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_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_category"
+        android:title="@string/search">
+
+        <ListPreference
+            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="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="full_screen_browsing_mode"
+            android:title="@string/full_screen_browsing_mode"
+            android:summary="@string/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_settings"
-        android:title="@string/general_settings" >
+        android:key="general"
+        android:title="@string/general" >
 
         <EditTextPreference
             android:key="homepage"
-            android:title="@string/homepage_preference"
-            android:summary="@string/homepage_preference_summary"
-            android:defaultValue="https://www.duckduckgo.com"
-            android:singleLine="true"/>
+            android:title="@string/homepage"
+            android:defaultValue="https://duckduckgo.com"
+            android:inputType="textUri"
+            android:icon="@drawable/home_enabled" />
+
+        <ListPreference
+            android:key="default_font_size"
+            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:icon="@drawable/font_size" />
+
+        <SwitchPreference
+            android:key="swipe_to_refresh"
+            android:title="@string/swipe_to_refresh_enabled"
+            android:summary="@string/swipe_to_refresh_enabled_summary"
+            android:defaultValue="false" />
+
+        <SwitchPreference
+            android:key="display_additional_app_bar_icons"
+            android:title="@string/display_additional_app_bar_icons"
+            android:summary="@string/display_additional_app_bar_icons_summary"
+            android:defaultValue="false" />
     </PreferenceCategory>
 </PreferenceScreen>
\ No newline at end of file