From 06322aadb94de0a8a3914b22348f0d8dcb16bbce Mon Sep 17 00:00:00 2001
From: hunterstich <hunterstich@google.com>
Date: Thu, 10 Sep 2020 10:27:28 -0400
Subject: [PATCH] [Motion] Updated MaterialFadeThrough to respect client-set
 alpha values on target views.

Resolves https://github.com/material-components/material-components-android/issues/1701

PiperOrigin-RevId: 330932760
---
 .../android/material/transition/FadeThroughProvider.java      | 4 ++--
 .../material/transition/platform/FadeThroughProvider.java     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/java/com/google/android/material/transition/FadeThroughProvider.java b/lib/java/com/google/android/material/transition/FadeThroughProvider.java
index 811157453..79cae2fe0 100644
--- a/lib/java/com/google/android/material/transition/FadeThroughProvider.java
+++ b/lib/java/com/google/android/material/transition/FadeThroughProvider.java
@@ -42,7 +42,7 @@ public final class FadeThroughProvider implements VisibilityAnimatorProvider {
     return createFadeThroughAnimator(
         view,
         /* startValue= */ 0f,
-        /* endValue= */ 1f,
+        /* endValue= */ view.getAlpha(),
         /* startFraction= */ PROGRESS_THRESHOLD,
         /* endFraction= */ 1f);
   }
@@ -52,7 +52,7 @@ public final class FadeThroughProvider implements VisibilityAnimatorProvider {
   public Animator createDisappear(@NonNull ViewGroup sceneRoot, @NonNull View view) {
     return createFadeThroughAnimator(
         view,
-        /* startValue= */ 1f,
+        /* startValue= */ view.getAlpha(),
         /* endValue= */ 0f,
         /* startFraction= */ 0f,
         /* endFraction= */ PROGRESS_THRESHOLD);
diff --git a/lib/java/com/google/android/material/transition/platform/FadeThroughProvider.java b/lib/java/com/google/android/material/transition/platform/FadeThroughProvider.java
index 52f57aacd..fe518d620 100644
--- a/lib/java/com/google/android/material/transition/platform/FadeThroughProvider.java
+++ b/lib/java/com/google/android/material/transition/platform/FadeThroughProvider.java
@@ -47,7 +47,7 @@ public final class FadeThroughProvider implements VisibilityAnimatorProvider {
     return createFadeThroughAnimator(
         view,
         /* startValue= */ 0f,
-        /* endValue= */ 1f,
+        /* endValue= */ view.getAlpha(),
         /* startFraction= */ PROGRESS_THRESHOLD,
         /* endFraction= */ 1f);
   }
@@ -57,7 +57,7 @@ public final class FadeThroughProvider implements VisibilityAnimatorProvider {
   public Animator createDisappear(@NonNull ViewGroup sceneRoot, @NonNull View view) {
     return createFadeThroughAnimator(
         view,
-        /* startValue= */ 1f,
+        /* startValue= */ view.getAlpha(),
         /* endValue= */ 0f,
         /* startFraction= */ 0f,
         /* endFraction= */ PROGRESS_THRESHOLD);