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

Commit fc90f32f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I353adb2efea6ba9f3955b051b2987f53d3ee5ae0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 26dcca6b eb3d2a32

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

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