From e247870b9fe6165d872afbf090aa3746073f26ed Mon Sep 17 00:00:00 2001 From: Sawyer Blatz Date: Fri, 13 Sep 2019 10:18:25 -0700 Subject: [PATCH] For #5277: Updates string for delete browsing data (#5309) --- .../java/org/mozilla/fenix/library/history/HistoryFragment.kt | 2 +- .../org/mozilla/fenix/settings/DeleteBrowsingDataFragment.kt | 2 +- app/src/main/res/values/strings.xml | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/org/mozilla/fenix/library/history/HistoryFragment.kt b/app/src/main/java/org/mozilla/fenix/library/history/HistoryFragment.kt index 7536751b7..2e6385e45 100644 --- a/app/src/main/java/org/mozilla/fenix/library/history/HistoryFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/library/history/HistoryFragment.kt @@ -27,9 +27,9 @@ import kotlinx.coroutines.launch import mozilla.components.lib.state.ext.consumeFrom import mozilla.components.support.base.feature.BackHandler import org.mozilla.fenix.BrowserDirection -import org.mozilla.fenix.browser.browsingmode.BrowsingMode import org.mozilla.fenix.HomeActivity import org.mozilla.fenix.R +import org.mozilla.fenix.browser.browsingmode.BrowsingMode import org.mozilla.fenix.components.Components import org.mozilla.fenix.components.StoreProvider import org.mozilla.fenix.components.history.createSynchronousPagedHistoryProvider diff --git a/app/src/main/java/org/mozilla/fenix/settings/DeleteBrowsingDataFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/DeleteBrowsingDataFragment.kt index 7c5a88cb9..5d9dc4b37 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/DeleteBrowsingDataFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/DeleteBrowsingDataFragment.kt @@ -94,7 +94,7 @@ class DeleteBrowsingDataFragment : Fragment() { private fun askToDelete() { context?.let { AlertDialog.Builder(it).apply { - setMessage(R.string.delete_browsing_data_prompt_message) + setMessage(R.string.delete_browsing_data_prompt_message_3) setNegativeButton(R.string.delete_browsing_data_prompt_cancel) { it: DialogInterface, _ -> it.cancel() diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 1aa42ac25..b5657abce 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -692,8 +692,6 @@ This will delete all of your browsing data. - - Are you sure you want to delete the selected browsing data? %s will delete the selected browsing data.