From 46b5dd27065a50643dd96145ae39131014d45a45 Mon Sep 17 00:00:00 2001 From: mike a Date: Wed, 29 Dec 2021 12:39:52 -0800 Subject: [PATCH] Closes #10737: Searching a language/saved password displays a misplaced "x". Setting max width for the search view in language settings and saved logins screens. Removed SyncAuthClosed event from LocaleSettingsFragment, an apparent copy-paste. --- .../fenix/settings/advanced/LocaleSettingsFragment.kt | 8 +------- .../fenix/settings/logins/fragment/SavedLoginsFragment.kt | 1 + 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/org/mozilla/fenix/settings/advanced/LocaleSettingsFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/advanced/LocaleSettingsFragment.kt index 1729cdfbc..0e7ff6c1a 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/advanced/LocaleSettingsFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/advanced/LocaleSettingsFragment.kt @@ -18,10 +18,8 @@ import mozilla.components.support.ktx.android.view.hideKeyboard import mozilla.components.support.locale.LocaleUseCases import org.mozilla.fenix.R import org.mozilla.fenix.components.StoreProvider -import org.mozilla.fenix.components.metrics.Event import org.mozilla.fenix.databinding.FragmentLocaleSettingsBinding import org.mozilla.fenix.ext.components -import org.mozilla.fenix.ext.requireComponents import org.mozilla.fenix.ext.showToolbar class LocaleSettingsFragment : Fragment() { @@ -71,6 +69,7 @@ class LocaleSettingsFragment : Fragment() { val searchView: SearchView = searchItem.actionView as SearchView searchView.imeOptions = EditorInfo.IME_ACTION_DONE searchView.queryHint = getString(R.string.locale_search_hint) + searchView.maxWidth = Int.MAX_VALUE searchView.setOnQueryTextListener(object : SearchView.OnQueryTextListener { override fun onQueryTextSubmit(query: String): Boolean { @@ -107,9 +106,4 @@ class LocaleSettingsFragment : Fragment() { _binding = null } - - override fun onDestroy() { - super.onDestroy() - requireComponents.analytics.metrics.track(Event.SyncAuthClosed) - } } diff --git a/app/src/main/java/org/mozilla/fenix/settings/logins/fragment/SavedLoginsFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/logins/fragment/SavedLoginsFragment.kt index 47907b93f..aed0810d3 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/logins/fragment/SavedLoginsFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/logins/fragment/SavedLoginsFragment.kt @@ -120,6 +120,7 @@ class SavedLoginsFragment : Fragment() { val searchView: SearchView = searchItem.actionView as SearchView searchView.imeOptions = EditorInfo.IME_ACTION_DONE searchView.queryHint = getString(R.string.preferences_passwords_saved_logins_search) + searchView.maxWidth = Int.MAX_VALUE searchView.setOnQueryTextListener(object : SearchView.OnQueryTextListener { override fun onQueryTextSubmit(query: String?): Boolean {