From 471cfbfaeb0a22285790c0fc65c1f3e0c03a48bc Mon Sep 17 00:00:00 2001
From: Selim Cinek <cinek@google.com>
Date: Fri, 3 May 2019 19:15:01 -0700
Subject: [PATCH] Fixed the transformation for MessagingStyle

Previously the calculations for the transformations
were off, leading to wrong transformations and
messages that would be invisible during the
transformations

Fixes: 122980290
Test: add multiple messages, observe right transformations
Change-Id: I4eb430f99017148e662dd35f744b70f1148b982c
---
 .../MessagingLayoutTransformState.java        | 37 +++++++++++--------
 1 file changed, 22 insertions(+), 15 deletions(-)

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/MessagingLayoutTransformState.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/MessagingLayoutTransformState.java
index 0a2e04fd9430c..b732966b32dbf 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/MessagingLayoutTransformState.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/MessagingLayoutTransformState.java
@@ -97,7 +97,6 @@ public class MessagingLayoutTransformState extends TransformState {
         HashMap<MessagingGroup, MessagingGroup> pairs = findPairs(ownGroups, otherGroups);
         MessagingGroup lastPairedGroup = null;
         float currentTranslation = 0;
-        float transformationDistanceRemaining = 0;
         for (int i = ownGroups.size() - 1; i >= 0; i--) {
             MessagingGroup ownGroup = ownGroups.get(i);
             MessagingGroup matchingGroup = pairs.get(ownGroup);
@@ -108,13 +107,10 @@ public class MessagingLayoutTransformState extends TransformState {
                         lastPairedGroup = ownGroup;
                         if (to){
                             float totalTranslation = ownGroup.getTop() - matchingGroup.getTop();
-                            transformationDistanceRemaining
-                                    = matchingGroup.getAvatar().getTranslationY();
-                            currentTranslation = transformationDistanceRemaining - totalTranslation;
+                            currentTranslation = matchingGroup.getAvatar().getTranslationY()
+                                    - totalTranslation;
                         } else {
-                            float totalTranslation = matchingGroup.getTop() - ownGroup.getTop();
                             currentTranslation = ownGroup.getAvatar().getTranslationY();
-                            transformationDistanceRemaining = currentTranslation - totalTranslation;
                         }
                     }
                 } else {
@@ -122,14 +118,20 @@ public class MessagingLayoutTransformState extends TransformState {
                     if (lastPairedGroup != null) {
                         adaptGroupAppear(ownGroup, transformationAmount, currentTranslation,
                                 to);
-                        int distance = lastPairedGroup.getTop() - ownGroup.getTop();
-                        float transformationDistance = mTransformInfo.isAnimating()
-                                ? distance
-                                : ownGroup.getHeight() * 0.75f;
-                        float translationProgress = transformationDistanceRemaining
-                                - (distance - transformationDistance);
-                        groupTransformationAmount =
-                                translationProgress / transformationDistance;
+                        float newPosition = ownGroup.getTop() + currentTranslation;
+
+                        if (!mTransformInfo.isAnimating()) {
+                            // We fade the group away as soon as 1/2 of it is translated away on top
+                            float fadeStart = -ownGroup.getHeight() * 0.5f;
+                            groupTransformationAmount = (newPosition - fadeStart)
+                                    / Math.abs(fadeStart);
+                        } else {
+                            float fadeStart = -ownGroup.getHeight() * 0.75f;
+                            // We want to fade out as soon as the animation starts, let's add the
+                            // complete top in addition
+                            groupTransformationAmount = (newPosition - fadeStart)
+                                    / (Math.abs(fadeStart) + ownGroup.getTop());
+                        }
                         groupTransformationAmount = Math.max(0.0f, Math.min(1.0f,
                                 groupTransformationAmount));
                         if (to) {
@@ -175,7 +177,8 @@ public class MessagingLayoutTransformState extends TransformState {
             relativeOffset *= 0.5f;
         }
         ownGroup.getMessageContainer().setTranslationY(relativeOffset);
-        ownGroup.setTranslationY(overallTranslation * 0.85f);
+        ownGroup.getSenderView().setTranslationY(relativeOffset);
+        ownGroup.setTranslationY(overallTranslation * 0.9f);
     }
 
     private void disappear(MessagingGroup ownGroup, float transformationAmount) {
@@ -256,6 +259,9 @@ public class MessagingLayoutTransformState extends TransformState {
                 float distanceToTop = child.getTop() + child.getHeight() + previousTranslation;
                 transformationAmount = distanceToTop / child.getHeight();
                 transformationAmount = Math.max(0.0f, Math.min(1.0f, transformationAmount));
+                if (to) {
+                    transformationAmount = 1.0f - transformationAmount;
+                }
             }
             transformView(transformationAmount, to, child, otherChild, false, /* sameAsAny */
                     useLinearTransformation);
@@ -400,6 +406,7 @@ public class MessagingLayoutTransformState extends TransformState {
                 setClippingDeactivated(ownGroup.getSenderView(), false);
                 ownGroup.setTranslationY(0);
                 ownGroup.getMessageContainer().setTranslationY(0);
+                ownGroup.getSenderView().setTranslationY(0);
             }
             ownGroup.setTransformingImages(false);
             ownGroup.updateClipRect();