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

Merge "Remove a bit of animation clutter from group update cascades." into sc-dev

Browse Source
This commit is contained in:
Jeff DeCew
2021-04-08 17:53:09 +00:00
committed by Android (Google) Code Review
parent 164fadf842 e6df133d98
commit c08065383d
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/SystemUI/src/com/android/systemui/Interpolators.java
View File

@@ -40,6 +40,7 @@ public class Interpolators {
new PathInterpolator(0.8f, 0f, 0.6f, 1f);
public static final Interpolator FAST_OUT_LINEAR_IN = new PathInterpolator(0.4f, 0f, 1f, 1f);
public static final Interpolator LINEAR_OUT_SLOW_IN = new PathInterpolator(0f, 0f, 0.2f, 1f);
public static final Interpolator SLOW_OUT_LINEAR_IN = new PathInterpolator(0.8f, 0f, 1f, 1f);
public static final Interpolator ALPHA_IN = new PathInterpolator(0.4f, 0f, 1f, 1f);
public static final Interpolator ALPHA_OUT = new PathInterpolator(0f, 0f, 0.8f, 1f);
public static final Interpolator LINEAR = new LinearInterpolator();

8
packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ActivatableNotificationView.java
View File

@@ -720,6 +720,10 @@ public abstract class ActivatableNotificationView extends ExpandableOutlineView
mCurrentAppearInterpolator = mSlowOutFastInInterpolator;
mCurrentAlphaInterpolator = Interpolators.LINEAR_OUT_SLOW_IN;
targetValue = 1.0f;
if (!mIsHeadsUpAnimation && isChildInGroup()) {
// slower fade in of children to avoid visibly overlapping with other children
mCurrentAlphaInterpolator = Interpolators.SLOW_OUT_LINEAR_IN;
}
} else {
mCurrentAppearInterpolator = Interpolators.FAST_OUT_SLOW_IN;
mCurrentAlphaInterpolator = mSlowOutLinearInInterpolator;
@@ -819,6 +823,10 @@ public abstract class ActivatableNotificationView extends ExpandableOutlineView
if (mIsHeadsUpAnimation && !mIsAppearing) {
startWidthFraction = 0;
}
if (mIsAppearing && !mIsHeadsUpAnimation && isChildInGroup()) {
// Children in a group (when not heads up) should simply fade in.
startWidthFraction = 1;
}
float width = MathUtils.lerp(startWidthFraction, 1.0f, 1.0f - widthFraction)
* getWidth();
float left;