Merge "Support LaunchableView in activity launches" into tm-qpr-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
16e5052d16
@@ -199,6 +199,10 @@ open class GhostedViewLaunchAnimatorController @JvmOverloads constructor(
|
|||||||
// the content before fading out the background.
|
// the content before fading out the background.
|
||||||
ghostView = GhostView.addGhost(ghostedView, launchContainer)
|
ghostView = GhostView.addGhost(ghostedView, launchContainer)
|
||||||
|
|
||||||
|
// The ghost was just created, so ghostedView is currently invisible. We need to make sure
|
||||||
|
// that it stays invisible as long as we are animating.
|
||||||
|
(ghostedView as? LaunchableView)?.setShouldBlockVisibilityChanges(true)
|
||||||
|
|
||||||
val matrix = ghostView?.animationMatrix ?: Matrix.IDENTITY_MATRIX
|
val matrix = ghostView?.animationMatrix ?: Matrix.IDENTITY_MATRIX
|
||||||
matrix.getValues(initialGhostViewMatrixValues)
|
matrix.getValues(initialGhostViewMatrixValues)
|
||||||
|
|
||||||
@@ -293,6 +297,7 @@ open class GhostedViewLaunchAnimatorController @JvmOverloads constructor(
|
|||||||
backgroundDrawable?.wrapped?.alpha = startBackgroundAlpha
|
backgroundDrawable?.wrapped?.alpha = startBackgroundAlpha
|
||||||
|
|
||||||
GhostView.removeGhost(ghostedView)
|
GhostView.removeGhost(ghostedView)
|
||||||
|
(ghostedView as? LaunchableView)?.setShouldBlockVisibilityChanges(false)
|
||||||
launchContainerOverlay.remove(backgroundView)
|
launchContainerOverlay.remove(backgroundView)
|
||||||
|
|
||||||
// Make sure that the view is considered VISIBLE by accessibility by first making it
|
// Make sure that the view is considered VISIBLE by accessibility by first making it
|
||||||
|
|||||||
Reference in New Issue
Block a user