commit e858e30c4672669fd337da19ad08d07bf4448951
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Mar 03 01:34:12 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 03 01:34:12 2020 +0000
tree ece8a9c14d28750605a8977868eedac77baa84d8
parent 78afcedf9fefcd651802183f7844d3660e3e67df
parent b71e6892f12a5704288ef7f9ec83bd7686ba6f52

Merge "Fix broken inset anims" into rvc-dev

core/java/android/view/InsetsAnimationControlImpl.java

diff --git a/core/java/android/view/InsetsAnimationControlImpl.java b/core/java/android/view/InsetsAnimationControlImpl.java
index 44ecb54..9a53a43 100644
--- a/core/java/android/view/InsetsAnimationControlImpl.java
+++ b/core/java/android/view/InsetsAnimationControlImpl.java
@@ -281,7 +281,7 @@
             // If the system is controlling the insets source, the leash can be null.
             if (leash != null) {
                 // TODO: use a better interpolation for fade.
-                alpha = mFade ? ((float) maxInset / inset * 0.3f + 0.7f) : alpha;
+                alpha = mFade ? ((float) inset / maxInset * 0.3f + 0.7f) : alpha;
                 surfaceParams.add(new SurfaceParams(leash, side == ISIDE_FLOATING ? 1 : alpha,
                         mTmpMatrix, null /* windowCrop */, 0 /* layer */, 0f /* cornerRadius*/,
                         side == ISIDE_FLOATING ? state.getSource(source.getType()).isVisible()