X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Fxml%2Fpreferences.xml;h=1bdbd183b285f270667321dc0ffd82986a8e116f;hb=b0f0322c62a5cd25e587f1760a33fcf60c279954;hp=f5f3eb3fe9d45e151669d86c75deac2def2b5556;hpb=9d621a09cdc72a3ad434084b3aab297f3a7a9d44;p=PrivacyBrowserAndroid.git

diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index f5f3eb3f..1bdbd183 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-2020 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
@@ -25,20 +25,14 @@
 
         <SwitchPreference
             android:key="javascript"
-            android:title="@string/javascript_preference"
+            android:title="@string/javascript"
             android:summary="@string/javascript_preference_summary"
             android:defaultValue="false" />
 
         <SwitchPreference
-            android:key="first_party_cookies"
-            android:title="@string/first_party_cookies_preference"
-            android:summary="@string/first_party_cookies_preference_summary"
-            android:defaultValue="false" />
-
-        <SwitchPreference
-            android:key="third_party_cookies"
-            android:title="@string/third_party_cookies_preference"
-            android:summary="@string/third_party_cookies_summary"
+            android:key="cookies"
+            android:title="@string/cookies"
+            android:summary="@string/cookies_preference_summary"
             android:defaultValue="false" />
 
         <SwitchPreference
@@ -60,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
@@ -75,12 +69,6 @@
             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" />
-
         <SwitchPreference
             android:key="allow_screenshots"
             android:title="@string/allow_screenshots"
@@ -168,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"
@@ -241,6 +229,12 @@
             android:summary="@string/clear_form_data_summary"
             android:defaultValue="true" />
 
+        <SwitchPreference
+            android:key="clear_logcat"
+            android:title="@string/clear_logcat_preference"
+            android:summary="@string/clear_logcat_summary"
+            android:defaultValue="true" />
+
         <SwitchPreference
             android:key="clear_cache"
             android:title="@string/clear_cache"
@@ -257,21 +251,7 @@
             android:title="@string/homepage"
             android:defaultValue="@string/homepage_default_value"
             android:inputType="textUri"
-            android:icon="?attr/homepageIcon" />
-
-        <ListPreference
-            android:key="download_location"
-            android:title="@string/download_location"
-            android:entries="@array/download_location_entries"
-            android:entryValues="@array/download_location_entry_values"
-            android:defaultValue="@string/download_location_default_value"
-            android:icon="?attr/downloadIcon" />
-
-        <EditTextPreference
-            android:key="download_custom_location"
-            android:title="@string/download_custom_location"
-            android:defaultValue="@string/download_custom_location_default_value"
-            android:inputType="textUri" />
+            android:icon="@drawable/home" />
 
         <!-- `android:inputType="number"` currently doesn't work with AndroidX. -->
         <EditTextPreference
@@ -279,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"
@@ -293,12 +273,24 @@
             android:summary="@string/swipe_to_refresh_summary"
             android:defaultValue="true" />
 
+        <SwitchPreference
+            android:key="download_with_external_app"
+            android:title="@string/download_with_external_app"
+            android:summary="@string/download_with_external_app_summary"
+            android:defaultValue="false" />
+
         <SwitchPreference
             android:key="scroll_app_bar"
             android:title="@string/scroll_app_bar"
             android:summary="@string/scroll_app_bar_summary"
             android:defaultValue="true" />
 
+        <SwitchPreference
+            android:key="bottom_app_bar"
+            android:title="@string/bottom_app_bar"
+            android:summary="@string/bottom_app_bar_summary"
+            android:defaultValue="false" />
+
         <SwitchPreference
             android:key="display_additional_app_bar_icons"
             android:title="@string/display_additional_app_bar_icons"
@@ -311,15 +303,14 @@
             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"
             android:title="@string/webview_theme"
             android:entries="@array/webview_theme_entries"
             android:entryValues="@array/webview_theme_entry_values"
-            android:defaultValue="@string/webview_theme_default_value"
-            android:icon="?attr/webViewThemeIcon" />
+            android:defaultValue="@string/webview_theme_default_value" />
 
         <SwitchPreference
             android:key="wide_viewport"