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

Commit 5718d802 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: I07048f5584000cc8943b284c93aed254873463bf
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1eaa0afe eb3d2a32

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

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