From d1b6bdc7e88198852637baa9d3846a5955d7bd4c Mon Sep 17 00:00:00 2001
From: Peter Kalauskas <peskal@google.com>
Date: Thu, 2 Jun 2022 17:05:14 +0000
Subject: [PATCH] Revert "Fix text crossfade"

This reverts commit ccc3a662318d99599d98a47e6c724e50fed987e1.

Reason for revert: b/234407239

Change-Id: I4a4c6c96ff69249a3adb9d42bcda0cfa920156b1
---
 .../statusbar/notification/TransformState.java        | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

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