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

Merge "Revert "Fix text crossfade"" into tm-dev am: 6be22611c4

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

Change-Id: I404b05f8b27698fd52a144cacbe604e5bbe5ebb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-06-02 20:35:21 +00:00
committed by Automerger Merge Worker
parent a73badef99 6be22611c4
commit eb3d2a3228
1 changed files with 2 additions and 9 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,7 +16,6 @@
package com.android.systemui.statusbar.notification; package com.android.systemui.statusbar.notification;
import android.util.MathUtils;
import android.util.Pools; import android.util.Pools;
import android.view.View; import android.view.View;
import android.view.animation.Interpolator; import android.view.animation.Interpolator;
@@ -99,10 +98,7 @@ public class TransformState {
if (sameAs(otherState)) { if (sameAs(otherState)) {
ensureVisible(); ensureVisible();
} else { } else {
CrossFadeHelper.fadeIn( CrossFadeHelper.fadeIn(mTransformedView, transformationAmount, true /* remap */);
mTransformedView,
MathUtils.constrainedMap(0, 1, 0.45f, 1, transformationAmount),
false /* remap */);
} }
transformViewFullyFrom(otherState, transformationAmount); transformViewFullyFrom(otherState, transformationAmount);
} }
@@ -298,10 +294,7 @@ public class TransformState {
} }
return false; return false;
} else { } else {
CrossFadeHelper.fadeOut( CrossFadeHelper.fadeOut(mTransformedView, transformationAmount);
mTransformedView,
MathUtils.constrainedMap(0, 1, 0, 0.55f, transformationAmount),
false /* remap */);
} }
transformViewFullyTo(otherState, transformationAmount); transformViewFullyTo(otherState, transformationAmount);
return true; return true;