diff options
4 files changed, 21 insertions, 4 deletions
diff --git a/packages/SystemUI/animation/src/com/android/systemui/animation/ActivityLaunchAnimator.kt b/packages/SystemUI/animation/src/com/android/systemui/animation/ActivityLaunchAnimator.kt index c3f6a5d18b74..0da60f0b3d66 100644 --- a/packages/SystemUI/animation/src/com/android/systemui/animation/ActivityLaunchAnimator.kt +++ b/packages/SystemUI/animation/src/com/android/systemui/animation/ActivityLaunchAnimator.kt @@ -298,6 +298,9 @@ class ActivityLaunchAnimator( * * Important: The view must be attached to a [ViewGroup] when calling this function and * during the animation. For safety, this method will return null when it is not. + * + * Note: The background of [view] should be a (rounded) rectangle so that it can be + * properly animated. */ @JvmStatic fun fromView(view: View, cujType: Int? = null): Controller? { diff --git a/packages/SystemUI/animation/src/com/android/systemui/animation/DialogLaunchAnimator.kt b/packages/SystemUI/animation/src/com/android/systemui/animation/DialogLaunchAnimator.kt index a3c5649e3fec..50178f470fd8 100644 --- a/packages/SystemUI/animation/src/com/android/systemui/animation/DialogLaunchAnimator.kt +++ b/packages/SystemUI/animation/src/com/android/systemui/animation/DialogLaunchAnimator.kt @@ -79,6 +79,9 @@ class DialogLaunchAnimator @JvmOverloads constructor( * If [animateBackgroundBoundsChange] is true, then the background of the dialog will be * animated when the dialog bounds change. * + * Note: The background of [view] should be a (rounded) rectangle so that it can be properly + * animated. + * * Caveats: When calling this function and [dialog] is not a fullscreen dialog, then it will be * made fullscreen and 2 views will be inserted between the dialog DecorView and its children. */ @@ -153,6 +156,9 @@ class DialogLaunchAnimator @JvmOverloads constructor( * activity started, when the dialog to app animation is done (or when it is cancelled). If this * method returns null, then the dialog won't be dismissed. * + * Note: The background of [view] should be a (rounded) rectangle so that it can be properly + * animated. + * * @param view any view inside the dialog to animate. */ @JvmOverloads diff --git a/packages/SystemUI/res/drawable/qs_footer_action_circle.xml b/packages/SystemUI/res/drawable/qs_footer_action_circle.xml index d057f5f32dc4..31a8c3bc2397 100644 --- a/packages/SystemUI/res/drawable/qs_footer_action_circle.xml +++ b/packages/SystemUI/res/drawable/qs_footer_action_circle.xml @@ -19,13 +19,17 @@ <ripple android:color="?android:attr/colorControlHighlight"> <item android:id="@android:id/mask"> - <shape android:shape="oval"> + <!-- We make this shape a rounded rectangle instead of a oval so that it can animate --> + <!-- properly into an app/dialog. --> + <shape android:shape="rectangle"> <solid android:color="@android:color/white"/> + <corners android:radius="@dimen/qs_footer_action_corner_radius"/> </shape> </item> <item> - <shape android:shape="oval"> + <shape android:shape="rectangle"> <solid android:color="?attr/offStateColor"/> + <corners android:radius="@dimen/qs_footer_action_corner_radius"/> </shape> </item> diff --git a/packages/SystemUI/res/drawable/qs_footer_action_circle_color.xml b/packages/SystemUI/res/drawable/qs_footer_action_circle_color.xml index 944061cc8e70..021a85f6a244 100644 --- a/packages/SystemUI/res/drawable/qs_footer_action_circle_color.xml +++ b/packages/SystemUI/res/drawable/qs_footer_action_circle_color.xml @@ -19,13 +19,17 @@ <ripple android:color="?android:attr/colorControlHighlight"> <item android:id="@android:id/mask"> - <shape android:shape="oval"> + <!-- We make this shape a rounded rectangle instead of a oval so that it can animate --> + <!-- properly into an app/dialog. --> + <shape android:shape="rectangle"> <solid android:color="@android:color/white"/> + <corners android:radius="@dimen/qs_footer_action_corner_radius"/> </shape> </item> <item> - <shape android:shape="oval"> + <shape android:shape="rectangle"> <solid android:color="?android:attr/colorAccent"/> + <corners android:radius="@dimen/qs_footer_action_corner_radius"/> </shape> </item> |