Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix the new QS footer buttons animation" into tm-dev am: d20c9f62e6

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16975983

Change-Id: I7e7538cb0ca0103f4fb0fed54f90c9c9a644ad54
This commit is contained in:
TreeHugger Robot
2022-02-23 17:10:23 +00:00
committed by Automerger Merge Worker
parent 2fb7a557fa d20c9f62e6
commit 4f9afbc362
4 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/animation/src/com/android/systemui/animation/ActivityLaunchAnimator.kt
View File

@@ -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? {

6
packages/SystemUI/animation/src/com/android/systemui/animation/DialogLaunchAnimator.kt
View File

@@ -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

8
packages/SystemUI/res/drawable/qs_footer_action_circle.xml
View File

@@ -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>

8
packages/SystemUI/res/drawable/qs_footer_action_circle_color.xml
View File

@@ -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>