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

Merge "Fix text crossfade" into tm-dev am: 426c815c77 am: 987d8f4edf

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

Change-Id: Iaaa798f47ee0ac969d1f2b10a16a77445b8e8c0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Lucas Dupin
2022-05-18 22:11:40 +00:00
committed by Automerger Merge Worker
parent e2ef18ca5c 987d8f4edf
commit 7e39961602
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;