commit 6be22611c466114fd8e3cd0a4b9c86148aef1f1e
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Jun 02 20:34:43 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jun 02 20:34:43 2022 +0000
tree 40e0e7e506585ee9b81627055f82258c3bfa6da5
parent b2aad08eb80f50c1b163a2a03a98abbfdfc76f4e
parent d1b6bdc7e88198852637baa9d3846a5955d7bd4c

Merge "Revert "Fix text crossfade"" into tm-dev

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

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 f84a6df..9f9fba4 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 @@
         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 @@
             }
             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;