Merge #6007
6007: No issue: Remove black flash workaround r=boek a=ekager For #5984 Co-authored-by: ekager <emilykager@gmail.com>
This commit is contained in:
commit
a918c4552f
|
@ -6,6 +6,8 @@ package org.mozilla.fenix.browser
|
|||
|
||||
import android.content.Intent
|
||||
import android.content.pm.ActivityInfo
|
||||
import android.graphics.Color
|
||||
import android.graphics.drawable.ColorDrawable
|
||||
import android.os.Bundle
|
||||
import android.view.LayoutInflater
|
||||
import android.view.View
|
||||
|
@ -13,13 +15,11 @@ import android.view.ViewGroup
|
|||
import androidx.annotation.CallSuper
|
||||
import androidx.appcompat.app.AppCompatActivity
|
||||
import androidx.coordinatorlayout.widget.CoordinatorLayout
|
||||
import androidx.core.graphics.drawable.toDrawable
|
||||
import androidx.core.net.toUri
|
||||
import androidx.fragment.app.Fragment
|
||||
import androidx.fragment.app.activityViewModels
|
||||
import androidx.lifecycle.ViewModelProvider
|
||||
import androidx.lifecycle.lifecycleScope
|
||||
import androidx.lifecycle.whenStarted
|
||||
import androidx.navigation.NavDirections
|
||||
import androidx.navigation.fragment.findNavController
|
||||
import com.google.android.material.snackbar.Snackbar
|
||||
|
@ -402,15 +402,9 @@ abstract class BaseBrowserFragment : Fragment(), BackHandler, SessionManager.Obs
|
|||
|
||||
private fun adjustBackgroundAndNavigate(directions: NavDirections) {
|
||||
context?.let {
|
||||
engineView.captureThumbnail { bitmap ->
|
||||
lifecycleScope.launch {
|
||||
whenStarted {
|
||||
swipeRefresh?.background = bitmap?.toDrawable(it.resources)
|
||||
engineView?.asView()?.visibility = View.GONE
|
||||
findNavController().nav(R.id.browserFragment, directions)
|
||||
}
|
||||
}
|
||||
}
|
||||
swipeRefresh?.background = ColorDrawable(Color.TRANSPARENT)
|
||||
engineView?.asView()?.visibility = View.GONE
|
||||
findNavController().nav(R.id.browserFragment, directions)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -6,10 +6,11 @@ package org.mozilla.fenix.components.toolbar
|
|||
|
||||
import android.app.Activity
|
||||
import android.content.Intent
|
||||
import android.graphics.Color
|
||||
import android.graphics.drawable.ColorDrawable
|
||||
import android.view.View
|
||||
import android.view.ViewGroup
|
||||
import androidx.annotation.VisibleForTesting
|
||||
import androidx.core.graphics.drawable.toDrawable
|
||||
import androidx.core.widget.NestedScrollView
|
||||
import androidx.lifecycle.LifecycleCoroutineScope
|
||||
import androidx.navigation.NavController
|
||||
|
@ -217,20 +218,16 @@ class DefaultBrowserToolbarController(
|
|||
browserLayout,
|
||||
"${TAB_ITEM_TRANSITION_NAME}${currentSession?.id}"
|
||||
).build()
|
||||
engineView.captureThumbnail { bitmap ->
|
||||
scope.launch {
|
||||
swipeRefresh.background = bitmap?.toDrawable(activity.resources)
|
||||
engineView.asView().visibility = View.GONE
|
||||
if (!navController.popBackStack(R.id.homeFragment, false)) {
|
||||
navController.nav(
|
||||
R.id.browserFragment,
|
||||
R.id.action_browserFragment_to_homeFragment,
|
||||
null,
|
||||
options,
|
||||
extras
|
||||
)
|
||||
}
|
||||
}
|
||||
swipeRefresh.background = ColorDrawable(Color.TRANSPARENT)
|
||||
engineView.asView().visibility = View.GONE
|
||||
if (!navController.popBackStack(R.id.homeFragment, false)) {
|
||||
navController.nav(
|
||||
R.id.browserFragment,
|
||||
R.id.action_browserFragment_to_homeFragment,
|
||||
null,
|
||||
options,
|
||||
extras
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user