X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Fxml%2Fpreferences.xml;h=5124481bd65597004a0e74d171768392732745b6;hb=57b05bcbae9759d4b58ce3b96ede61992eb34eee;hp=97965a5b66b05db2ace2d92e0976c80eab6b8c61;hpb=218e03269d47ababa71ae0dcec7b6ea8fef20454;p=PrivacyBrowserAndroid.git

diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 97965a5b..5124481b 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -3,7 +3,7 @@
 <!--
   Copyright 2016 Soren Stoutner <soren@stoutner.com>.
 
-  This file is part of Privacy Browser <https://privacybrowser.stoutner.com/>.
+  This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
   Privacy Browser is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -20,36 +20,97 @@
 
 <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" >
 
-        <CheckBoxPreference
+        <SwitchPreference
             android:key="javascript_enabled"
             android:title="@string/javascript_preference"
             android:summary="@string/javascript_preference_summary"
             android:defaultValue="false" />
 
-        <CheckBoxPreference
+        <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"
             android:summary="@string/dom_storage_preference_summary"
             android:defaultValue="false" />
 
-        <CheckBoxPreference
-            android:key="cookies_enabled"
-            android:title="@string/cookies_preference"
-            android:summary="@string/cookies_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="Default user agent" />
+
+        // Android doesn't let EditTextPreferences have more than one line, but singleLine="false" is included in case they ever wisen up.
+        <EditTextPreference
+            android:key="custom_user_agent"
+            android:title="@string/custom_user_agent"
+            android:defaultValue="PrivacyBrowser/1.0"
+            android:inputType="textUri"
+            android:singleLine="false"/>
     </PreferenceCategory>
 
     <PreferenceCategory
-        android:key="general_settings"
-        android:title="@string/general_settings" >
+        android:key="search"
+        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:defaultValue="https://duckduckgo.com/html/?q=" />
+
+        <EditTextPreference
+            android:key="javascript_disabled_search_custom_url"
+            android:title="@string/javascript_disabled_search_custom_url"
+            android:defaultValue=""
+            android:inputType="textUri"
+            android:singleLine="true" />
+
+        <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=" />
+
+        <EditTextPreference
+            android:key="javascript_enabled_search_custom_url"
+            android:title="@string/javascript_enabled_search_custom_url"
+            android:defaultValue=""
+            android:inputType="textUri"
+            android:singleLine="true" />
+    </PreferenceCategory>
+
+    <PreferenceCategory
+        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:defaultValue="https://www.duckduckgo.com"
+            android:inputType="textUri"
+            android:singleLine="true" />
+
+        <SwitchPreference
+            android:key="swipe_to_refresh_enabled"
+            android:title="@string/swipe_to_refresh_enabled"
+            android:summary="@string/swipe_to_refresh_enabled_summary"
+            android:defaultValue="true" />
     </PreferenceCategory>
 </PreferenceScreen>
\ No newline at end of file