For #21776 - Remove redundant qualifier name

upstream-sync
Gabriel Luong 3 years ago committed by mergify[bot]
parent 1039a92281
commit 6d1d4bea93

@ -35,7 +35,6 @@ import androidx.navigation.fragment.NavHostFragment
import androidx.navigation.ui.AppBarConfiguration import androidx.navigation.ui.AppBarConfiguration
import androidx.navigation.ui.NavigationUI import androidx.navigation.ui.NavigationUI
import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.Dispatchers.IO import kotlinx.coroutines.Dispatchers.IO
import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.Job import kotlinx.coroutines.Job
@ -945,7 +944,7 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity {
isVisuallyComplete = true isVisuallyComplete = true
} }
private fun captureSnapshotTelemetryMetrics() = CoroutineScope(Dispatchers.IO).launch { private fun captureSnapshotTelemetryMetrics() = CoroutineScope(IO).launch {
// PWA // PWA
val recentlyUsedPwaCount = components.core.webAppShortcutManager.recentlyUsedWebAppsCount( val recentlyUsedPwaCount = components.core.webAppShortcutManager.recentlyUsedWebAppsCount(
activeThresholdMs = PWA_RECENTLY_USED_THRESHOLD activeThresholdMs = PWA_RECENTLY_USED_THRESHOLD

@ -13,7 +13,6 @@ import mozilla.components.lib.publicsuffixlist.PublicSuffixList
import mozilla.components.lib.state.Action import mozilla.components.lib.state.Action
import mozilla.components.lib.state.State import mozilla.components.lib.state.State
import mozilla.components.lib.state.Store import mozilla.components.lib.state.Store
import org.mozilla.fenix.collections.CollectionCreationAction.StepChanged
import org.mozilla.fenix.components.TabCollectionStorage import org.mozilla.fenix.components.TabCollectionStorage
import org.mozilla.fenix.ext.toShortUrl import org.mozilla.fenix.ext.toShortUrl
import org.mozilla.fenix.home.Tab import org.mozilla.fenix.home.Tab

@ -175,5 +175,5 @@ internal fun View.getKeyboardHeight(): Int {
* The assumed minimum height of the keyboard. * The assumed minimum height of the keyboard.
*/ */
@VisibleForTesting @VisibleForTesting
@Dimension(unit = Dimension.DP) @Dimension(unit = DP)
internal const val MINIMUM_KEYBOARD_HEIGHT = 100 internal const val MINIMUM_KEYBOARD_HEIGHT = 100

@ -230,7 +230,7 @@ class CreditCardsSettingFragment : BiometricPromptPreferenceFragment() {
getString(R.string.credit_cards_biometric_prompt_message_pin), getString(R.string.credit_cards_biometric_prompt_message_pin),
getString(R.string.credit_cards_biometric_prompt_message) getString(R.string.credit_cards_biometric_prompt_message)
) )
startActivityForResult(intent, BiometricPromptPreferenceFragment.PIN_REQUEST) startActivityForResult(intent, PIN_REQUEST)
} }
private fun navigateToCreditCardManagementFragment() { private fun navigateToCreditCardManagementFragment() {

@ -12,7 +12,6 @@ import androidx.fragment.app.Fragment
import androidx.lifecycle.lifecycleScope import androidx.lifecycle.lifecycleScope
import androidx.navigation.fragment.findNavController import androidx.navigation.fragment.findNavController
import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.Dispatchers.IO import kotlinx.coroutines.Dispatchers.IO
import kotlinx.coroutines.Dispatchers.Main import kotlinx.coroutines.Dispatchers.Main
import kotlinx.coroutines.cancel import kotlinx.coroutines.cancel
@ -193,10 +192,7 @@ class DeleteBrowsingDataFragment : Fragment(R.layout.fragment_delete_browsing_da
.setText(resources.getString(R.string.preferences_delete_browsing_data_snackbar)) .setText(resources.getString(R.string.preferences_delete_browsing_data_snackbar))
.show() .show()
if (popAfter) viewLifecycleOwner.lifecycleScope.launch( if (popAfter) viewLifecycleOwner.lifecycleScope.launch(Main) {
Dispatchers.Main
) {
findNavController().apply { findNavController().apply {
// If the user deletes all open tabs we need to make sure we remove // If the user deletes all open tabs we need to make sure we remove
// the BrowserFragment from the backstack. // the BrowserFragment from the backstack.
@ -241,9 +237,9 @@ class DeleteBrowsingDataFragment : Fragment(R.layout.fragment_delete_browsing_da
private fun updateHistoryCount() { private fun updateHistoryCount() {
binding.browsingDataItem.subtitleView.text = "" binding.browsingDataItem.subtitleView.text = ""
viewLifecycleOwner.lifecycleScope.launch(Dispatchers.IO) { viewLifecycleOwner.lifecycleScope.launch(IO) {
val historyCount = requireComponents.core.historyStorage.getVisited().size val historyCount = requireComponents.core.historyStorage.getVisited().size
launch(Dispatchers.Main) { launch(Main) {
binding.browsingDataItem.apply { binding.browsingDataItem.apply {
subtitleView.text = subtitleView.text =
resources.getString( resources.getString(

@ -32,7 +32,6 @@ import kotlinx.coroutines.CoroutineScope
import mozilla.components.browser.menu.BrowserMenu import mozilla.components.browser.menu.BrowserMenu
import mozilla.components.browser.state.store.BrowserStore import mozilla.components.browser.state.store.BrowserStore
import mozilla.components.support.test.robolectric.testContext import mozilla.components.support.test.robolectric.testContext
import org.junit.Assert
import org.junit.Assert.assertEquals import org.junit.Assert.assertEquals
import org.junit.Assert.assertFalse import org.junit.Assert.assertFalse
import org.junit.Assert.assertSame import org.junit.Assert.assertSame
@ -367,8 +366,8 @@ class TabsTrayFragmentTest {
) )
val behavior = BottomSheetBehavior.from(tabsTrayBinding.tabWrapper) val behavior = BottomSheetBehavior.from(tabsTrayBinding.tabWrapper)
Assert.assertFalse(behavior.isFitToContents) assertFalse(behavior.isFitToContents)
Assert.assertFalse(behavior.skipCollapsed) assertFalse(behavior.skipCollapsed)
assert(behavior.halfExpandedRatio <= 0.001f) assert(behavior.halfExpandedRatio <= 0.001f)
} }

Loading…
Cancel
Save