diff --git a/app/src/main/java/org/mozilla/fenix/settings/DeleteBrowsingDataFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/DeleteBrowsingDataFragment.kt
new file mode 100644
index 0000000000..04b427441e
--- /dev/null
+++ b/app/src/main/java/org/mozilla/fenix/settings/DeleteBrowsingDataFragment.kt
@@ -0,0 +1,28 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.mozilla.fenix.settings
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.appcompat.app.AppCompatActivity
+import androidx.fragment.app.Fragment
+import org.mozilla.fenix.R
+
+
+class DeleteBrowsingDataFragment : Fragment() {
+ override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+ return inflater.inflate(R.layout.fragment_delete_browsing_data, container, false)
+ }
+
+ override fun onResume() {
+ super.onResume()
+ (activity as AppCompatActivity).apply {
+ title = getString(R.string.preferences_delete_browsing_data)
+ supportActionBar?.show()
+ }
+ }
+}
diff --git a/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt
index 38cae0269b..24e61d2047 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt
@@ -33,6 +33,7 @@ import org.mozilla.fenix.R.string.pref_key_accessibility
import org.mozilla.fenix.R.string.pref_key_account
import org.mozilla.fenix.R.string.pref_key_account_category
import org.mozilla.fenix.R.string.pref_key_data_choices
+import org.mozilla.fenix.R.string.pref_key_delete_browsing_data
import org.mozilla.fenix.R.string.pref_key_help
import org.mozilla.fenix.R.string.pref_key_language
import org.mozilla.fenix.R.string.pref_key_leakcanary
@@ -161,6 +162,9 @@ class SettingsFragment : PreferenceFragmentCompat(), CoroutineScope, AccountObse
resources.getString(pref_key_account) -> {
navigateToAccountSettings()
}
+ resources.getString(pref_key_delete_browsing_data) -> {
+ navigateToDeleteBrowsingData()
+ }
resources.getString(pref_key_theme) -> {
navigateToThemeSettings()
}
@@ -293,6 +297,11 @@ class SettingsFragment : PreferenceFragmentCompat(), CoroutineScope, AccountObse
Navigation.findNavController(view!!).navigate(directions)
}
+ private fun navigateToDeleteBrowsingData() {
+ val directions = SettingsFragmentDirections.actionSettingsFragmentToDeleteBrowsingDataFragment()
+ Navigation.findNavController(view!!).navigate(directions)
+ }
+
override fun onAuthenticated(account: OAuthAccount) {
updateAuthState(account)
updateSignInVisibility()
diff --git a/app/src/main/res/drawable/ic_delete.xml b/app/src/main/res/drawable/ic_delete.xml
index d9b7e117a2..bc8e0f7208 100644
--- a/app/src/main/res/drawable/ic_delete.xml
+++ b/app/src/main/res/drawable/ic_delete.xml
@@ -1,14 +1,12 @@
-
-
-
+ android:strokeWidth="1"
+ android:fillColor="#20123A"
+ android:fillType="evenOdd"
+ android:strokeColor="#00000000"/>
diff --git a/app/src/main/res/layout/fragment_delete_browsing_data.xml b/app/src/main/res/layout/fragment_delete_browsing_data.xml
new file mode 100644
index 0000000000..38d9fb81cc
--- /dev/null
+++ b/app/src/main/res/layout/fragment_delete_browsing_data.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml
index 974e805313..2bc5334e1a 100644
--- a/app/src/main/res/navigation/nav_graph.xml
+++ b/app/src/main/res/navigation/nav_graph.xml
@@ -283,6 +283,9 @@
+
+
+
pref_key_accessibility_font_scale
pref_key_language
pref_key_data_choices
+ pref_key_delete_browsing_data
pref_key_help
pref_key_rate
pref_key_feedback
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c6471f03af..7015ea7e2a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -557,8 +557,12 @@
Make text on websites larger or smaller
Font Size
+
Automatic Font Sizing
Font size will match your Android settings. Disable to manage font size here.
+
+
+ Delete browsing data
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 84db3a55f6..520b6a06c4 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -59,6 +59,10 @@
android:icon="@drawable/ic_permission"
android:key="@string/pref_key_site_permissions"
android:title="@string/preferences_site_permissions" />
+