X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Fxml%2Fpreferences.xml;h=a27c1d83a5019d42410a4e2c4b04916e75e7d628;hb=323bc5323b1f8e2b9d0f78acfdd6b6c8e8246932;hp=9291837ea8c649bf5fc966f7ff003f917dd3725e;hpb=8d4d8f41d729dd0354d12fd99bd7d91b436feee5;p=PrivacyBrowserAndroid.git

diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 9291837e..a27c1d83 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright © 2016-2021 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2022 Soren Stoutner <soren@stoutner.com>.
 
-  This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
+  This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
 
-  Privacy Browser is free software: you can redistribute it and/or modify
+  Privacy Browser Android is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation, either version 3 of the License, or
   (at your option) any later version.
 
-  Privacy Browser is distributed in the hope that it will be useful,
+  Privacy Browser Android is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.
 
   You should have received a copy of the GNU General Public License
-  along with Privacy Browser.  If not, see <http://www.gnu.org/licenses/>. -->
+  along with Privacy Browser Android.  If not, see <http://www.gnu.org/licenses/>. -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
     <PreferenceCategory
@@ -30,7 +30,7 @@
             android:defaultValue="false" />
 
         <SwitchPreference
-            android:key="cookies"
+            android:key="@string/cookies_key"
             android:title="@string/cookies"
             android:summary="@string/cookies_preference_summary"
             android:defaultValue="false" />
@@ -54,7 +54,7 @@
             android:entries="@array/translated_user_agent_names"
             android:entryValues="@array/user_agent_names"
             android:defaultValue="@string/user_agent_default_value"
-            android:icon="?attr/userAgentIcon" />
+            android:icon="@drawable/user_agent" />
 
         <!-- android:inputType="textVisiblePassword" sets the keyboard to have a dedicated number row.-->
         <EditTextPreference
@@ -63,6 +63,12 @@
             android:defaultValue="@string/custom_user_agent_default_value"
             android:inputType="textVisiblePassword|textMultiLine" />
 
+        <SwitchPreference
+            android:key="@string/x_requested_with_header_key"
+            android:title="@string/x_requested_with_header"
+            android:summary="@string/x_requested_with_header_summary"
+            android:defaultValue="true" />
+
         <SwitchPreference
             android:key="incognito_mode"
             android:title="@string/incognito_mode"
@@ -70,7 +76,7 @@
             android:defaultValue="false" />
 
         <SwitchPreference
-            android:key="allow_screenshots"
+            android:key="@string/allow_screenshots_key"
             android:title="@string/allow_screenshots"
             android:summary="@string/allow_screenshots_summary"
             android:defaultValue="false" />
@@ -128,21 +134,15 @@
         android:title="@string/url_modification" >
 
         <SwitchPreference
-            android:key="google_analytics"
-            android:title="@string/google_analytics"
-            android:summary="@string/google_analytics_summary"
-            android:defaultValue="true" />
-
-        <SwitchPreference
-            android:key="facebook_click_ids"
-            android:title="@string/facebook_click_ids"
-            android:summary="@string/facebook_click_ids_summary"
+            android:key="@string/tracking_queries_key"
+            android:title="@string/tracking_queries"
+            android:summary="@string/tracking_queries_summary"
             android:defaultValue="true" />
 
         <SwitchPreference
-            android:key="twitter_amp_redirects"
-            android:title="@string/twitter_amp_redirects"
-            android:summary="@string/twitter_amp_redirects_summary"
+            android:key="@string/amp_redirects_key"
+            android:title="@string/amp_redirects"
+            android:summary="@string/amp_redirects_summary"
             android:defaultValue="true" />
     </PreferenceCategory>
 
@@ -156,7 +156,7 @@
             android:entries="@array/search_entries"
             android:entryValues="@array/search_entry_values"
             android:defaultValue="@string/search_default_value"
-            android:icon="?attr/searchIcon" />
+            android:icon="@drawable/search" />
 
         <EditTextPreference
             android:key="search_custom_url"
@@ -177,7 +177,7 @@
             android:defaultValue="@string/proxy_default_value" />
 
         <EditTextPreference
-            android:key="proxy_custom_url"
+            android:key="@string/proxy_custom_url_key"
             android:title="@string/proxy_custom_url"
             android:defaultValue="@string/proxy_custom_url_default_value"
             android:inputType="textUri" />
@@ -230,8 +230,8 @@
             android:defaultValue="true" />
 
         <SwitchPreference
-            android:key="clear_logcat"
-            android:title="@string/clear_logcat_preference"
+            android:key="@string/clear_logcat_key"
+            android:title="@string/clear_logcat"
             android:summary="@string/clear_logcat_summary"
             android:defaultValue="true" />
 
@@ -251,7 +251,7 @@
             android:title="@string/homepage"
             android:defaultValue="@string/homepage_default_value"
             android:inputType="textUri"
-            android:icon="?attr/homepageIcon" />
+            android:icon="@drawable/home" />
 
         <!-- `android:inputType="number"` currently doesn't work with AndroidX. -->
         <EditTextPreference
@@ -259,7 +259,7 @@
             android:title="@string/font_size_preference"
             android:defaultValue="@string/font_size_default_value"
             android:inputType="number"
-            android:icon="?attr/fontSizeIcon" />
+            android:icon="@drawable/font_size" />
 
         <SwitchPreference
             android:key="open_intents_in_new_tab"
@@ -274,13 +274,25 @@
             android:defaultValue="true" />
 
         <SwitchPreference
-            android:key="scroll_app_bar"
+            android:key="@string/download_with_external_app_key"
+            android:title="@string/download_with_external_app"
+            android:summary="@string/download_with_external_app_summary"
+            android:defaultValue="false" />
+
+        <SwitchPreference
+            android:key="@string/scroll_app_bar_key"
             android:title="@string/scroll_app_bar"
             android:summary="@string/scroll_app_bar_summary"
             android:defaultValue="true" />
 
         <SwitchPreference
-            android:key="display_additional_app_bar_icons"
+            android:key="@string/bottom_app_bar_key"
+            android:title="@string/bottom_app_bar"
+            android:summary="@string/bottom_app_bar_summary"
+            android:defaultValue="false" />
+
+        <SwitchPreference
+            android:key="@string/display_additional_app_bar_icons_key"
             android:title="@string/display_additional_app_bar_icons"
             android:summary="@string/display_additional_app_bar_icons_summary"
             android:defaultValue="false" />
@@ -291,7 +303,7 @@
             android:entries="@array/app_theme_entries"
             android:entryValues="@array/app_theme_entry_values"
             android:defaultValue="@string/app_theme_default_value"
-            android:icon="?attr/appThemeIcon" />
+            android:icon="@drawable/app_theme" />
 
         <ListPreference
             android:key="webview_theme"