[fenix] No issue: Remove black flash workaround

pull/600/head
ekager 5 years ago
parent 01fb7c04c6
commit 3978c2d797

@ -6,6 +6,8 @@ package org.mozilla.fenix.browser
import android.content.Intent import android.content.Intent
import android.content.pm.ActivityInfo import android.content.pm.ActivityInfo
import android.graphics.Color
import android.graphics.drawable.ColorDrawable
import android.os.Bundle import android.os.Bundle
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
@ -13,13 +15,11 @@ import android.view.ViewGroup
import androidx.annotation.CallSuper import androidx.annotation.CallSuper
import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
import androidx.coordinatorlayout.widget.CoordinatorLayout import androidx.coordinatorlayout.widget.CoordinatorLayout
import androidx.core.graphics.drawable.toDrawable
import androidx.core.net.toUri import androidx.core.net.toUri
import androidx.fragment.app.Fragment import androidx.fragment.app.Fragment
import androidx.fragment.app.activityViewModels import androidx.fragment.app.activityViewModels
import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.ViewModelProvider
import androidx.lifecycle.lifecycleScope import androidx.lifecycle.lifecycleScope
import androidx.lifecycle.whenStarted
import androidx.navigation.NavDirections import androidx.navigation.NavDirections
import androidx.navigation.fragment.findNavController import androidx.navigation.fragment.findNavController
import com.google.android.material.snackbar.Snackbar import com.google.android.material.snackbar.Snackbar
@ -402,17 +402,11 @@ abstract class BaseBrowserFragment : Fragment(), BackHandler, SessionManager.Obs
private fun adjustBackgroundAndNavigate(directions: NavDirections) { private fun adjustBackgroundAndNavigate(directions: NavDirections) {
context?.let { context?.let {
engineView.captureThumbnail { bitmap -> swipeRefresh?.background = ColorDrawable(Color.TRANSPARENT)
lifecycleScope.launch {
whenStarted {
swipeRefresh?.background = bitmap?.toDrawable(it.resources)
engineView?.asView()?.visibility = View.GONE engineView?.asView()?.visibility = View.GONE
findNavController().nav(R.id.browserFragment, directions) findNavController().nav(R.id.browserFragment, directions)
} }
} }
}
}
}
@CallSuper @CallSuper
override fun onSessionSelected(session: Session) { override fun onSessionSelected(session: Session) {

@ -6,10 +6,11 @@ package org.mozilla.fenix.components.toolbar
import android.app.Activity import android.app.Activity
import android.content.Intent import android.content.Intent
import android.graphics.Color
import android.graphics.drawable.ColorDrawable
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import androidx.annotation.VisibleForTesting import androidx.annotation.VisibleForTesting
import androidx.core.graphics.drawable.toDrawable
import androidx.core.widget.NestedScrollView import androidx.core.widget.NestedScrollView
import androidx.lifecycle.LifecycleCoroutineScope import androidx.lifecycle.LifecycleCoroutineScope
import androidx.navigation.NavController import androidx.navigation.NavController
@ -217,9 +218,7 @@ class DefaultBrowserToolbarController(
browserLayout, browserLayout,
"${TAB_ITEM_TRANSITION_NAME}${currentSession?.id}" "${TAB_ITEM_TRANSITION_NAME}${currentSession?.id}"
).build() ).build()
engineView.captureThumbnail { bitmap -> swipeRefresh.background = ColorDrawable(Color.TRANSPARENT)
scope.launch {
swipeRefresh.background = bitmap?.toDrawable(activity.resources)
engineView.asView().visibility = View.GONE engineView.asView().visibility = View.GONE
if (!navController.popBackStack(R.id.homeFragment, false)) { if (!navController.popBackStack(R.id.homeFragment, false)) {
navController.nav( navController.nav(
@ -231,8 +230,6 @@ class DefaultBrowserToolbarController(
) )
} }
} }
}
}
@SuppressWarnings("ComplexMethod") @SuppressWarnings("ComplexMethod")
private fun trackToolbarItemInteraction(item: ToolbarMenu.Item) { private fun trackToolbarItemInteraction(item: ToolbarMenu.Item) {

Loading…
Cancel
Save