Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 14c0d5c2 authored by Lucas Dupin's avatar Lucas Dupin Committed by Automerger Merge Worker
Browse files

Merge "Fix text crossfade" into tm-dev am: 426c815c 

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



Change-Id: I85eb107f9b4846fe9620cc35a2bd39ebdb30f9c0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a7360e35 426c815c

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

+9 −2
Original line number Diff line number Diff line
@@ -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;