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

Merge "Fix text crossfade" into tm-dev

Browse Source
This commit is contained in:
Lucas Dupin
2022-05-17 22:52:22 +00:00
committed by Android (Google) Code Review
parent c6947c262c ccc3a66231
commit 426c815c77
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
packages/SystemUI/src/com/android/systemui/statusbar/notification/TransformState.java
View File

@@ -16,6 +16,7 @@
package com.android.systemui.statusbar.notification;
import android.util.MathUtils;
import android.util.Pools;
import android.view.View;
import android.view.animation.Interpolator;
@@ -98,7 +99,10 @@ public class TransformState {
if (sameAs(otherState)) {
ensureVisible();
} else {
CrossFadeHelper.fadeIn(mTransformedView, transformationAmount, true /* remap */);
CrossFadeHelper.fadeIn(
mTransformedView,
MathUtils.constrainedMap(0, 1, 0.45f, 1, transformationAmount),
false /* remap */);
}
transformViewFullyFrom(otherState, transformationAmount);
}
@@ -294,7 +298,10 @@ public class TransformState {
}
return false;
} else {
CrossFadeHelper.fadeOut(mTransformedView, transformationAmount);
CrossFadeHelper.fadeOut(
mTransformedView,
MathUtils.constrainedMap(0, 1, 0, 0.55f, transformationAmount),
false /* remap */);
}
transformViewFullyTo(otherState, transformationAmount);
return true;