Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b971910d authored by Luca Zuccarini's avatar Luca Zuccarini Committed by Android (Google) Code Review
Browse files

Merge "Rename a few more animations classes to cover transitions in general." into main

parents dc86f285 0629a3e7

ktfmt_includes.txt

+1 −1
Original line number Diff line number Diff line
@@ -507,7 +507,7 @@ 
-packages/SystemUI/tests/src/com/android/systemui/ScreenDecorHwcLayerTest.kt

-packages/SystemUI/tests/src/com/android/systemui/animation/DialogLaunchAnimatorTest.kt

-packages/SystemUI/tests/src/com/android/systemui/animation/FontInterpolatorTest.kt

-packages/SystemUI/tests/src/com/android/systemui/animation/GhostedViewLaunchAnimatorControllerTest.kt

-packages/SystemUI/tests/src/com/android/systemui/animation/GhostedViewTransitionAnimatorControllerTest.kt

-packages/SystemUI/tests/src/com/android/systemui/animation/TextAnimatorTest.kt

-packages/SystemUI/tests/src/com/android/systemui/animation/TextInterpolatorTest.kt

-packages/SystemUI/tests/src/com/android/systemui/animation/ViewHierarchyAnimatorTest.kt

packages/SystemUI/animation/src/com/android/systemui/animation/ActivityTransitionAnimator.kt

+1 −1
Original line number Diff line number Diff line
@@ -399,7 +399,7 @@ class ActivityTransitionAnimator( 
                    return null

                }



                return GhostedViewLaunchAnimatorController(view, cujType)

                return GhostedViewTransitionAnimatorController(view, cujType)

            }

        }

packages/SystemUI/animation/src/com/android/systemui/animation/DelegateLaunchAnimatorController.kt→packages/SystemUI/animation/src/com/android/systemui/animation/DelegateTransitionAnimatorController.kt

+1 −1
Original line number Diff line number Diff line
@@ -21,6 +21,6 @@ package com.android.systemui.animation 
 * delegates most of its call to [delegate]. This is mostly useful for Java code which can't easily

 * create such a delegated class.

 */

open class DelegateLaunchAnimatorController(

open class DelegateTransitionAnimatorController(

    protected val delegate: ActivityTransitionAnimator.Controller

) : ActivityTransitionAnimator.Controller by delegate

packages/SystemUI/animation/src/com/android/systemui/animation/DialogLaunchAnimator.kt

+4 −4
Original line number Diff line number Diff line
@@ -633,7 +633,7 @@ private class AnimatedDialog( 


        val background = dialogContentWithBackground.background

        originalDialogBackgroundColor =

            GhostedViewLaunchAnimatorController.findGradientDrawable(background)

            GhostedViewTransitionAnimatorController.findGradientDrawable(background)

                ?.color

                ?.defaultColor

                ?: Color.BLACK
@@ -895,11 +895,11 @@ private class AnimatedDialog( 
            if (isLaunching) {

                controller.createTransitionController()

            } else {

                GhostedViewLaunchAnimatorController(dialogContentWithBackground!!)

                GhostedViewTransitionAnimatorController(dialogContentWithBackground!!)

            }

        val endController =

            if (isLaunching) {

                GhostedViewLaunchAnimatorController(dialogContentWithBackground!!)

                GhostedViewTransitionAnimatorController(dialogContentWithBackground!!)

            } else {

                controller.createExitController()

            }
@@ -968,7 +968,7 @@ private class AnimatedDialog( 
                    // Therefore we update the end state to the new position/size. Usually the

                    // dialog dimension or position will change in the early frames, so changing the

                    // end state shouldn't really be noticeable.

                    if (endController is GhostedViewLaunchAnimatorController) {

                    if (endController is GhostedViewTransitionAnimatorController) {

                        endController.fillGhostedViewState(endState)

                    }

                }

packages/SystemUI/animation/src/com/android/systemui/animation/GhostedViewLaunchAnimatorController.kt→packages/SystemUI/animation/src/com/android/systemui/animation/GhostedViewTransitionAnimatorController.kt

+2 −2
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ import java.util.LinkedList 
import kotlin.math.min

import kotlin.math.roundToInt



private const val TAG = "GhostedViewLaunchAnimatorController"

private const val TAG = "GhostedViewTransitionAnimatorController"



/**

 * A base implementation of [ActivityTransitionAnimator.Controller] which creates a
@@ -53,7 +53,7 @@ private const val TAG = "GhostedViewLaunchAnimatorController" 
 * Note: Avoid instantiating this directly and call [ActivityTransitionAnimator.Controller.fromView]

 * whenever possible instead.

 */

open class GhostedViewLaunchAnimatorController

open class GhostedViewTransitionAnimatorController

@JvmOverloads

constructor(

    /** The view that will be ghosted and from which the background will be extracted. */