From dbd9286abd8f90b9fa4c01a7f9c5a212adff877c Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Tue, 1 May 2018 13:07:53 -0700
Subject: [PATCH] Fade in LauncherRootView in finishFirstPageBind.

This ensures that the fade in animation will actually run, as DragLayer alpha
can be set by other means.

Bug: 72728697
Change-Id: I3ca0a6811b113e331119c74539a4421cfbdb51c9
---
 src/com/android/launcher3/Launcher.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 2c08169d8b..af4faa8ef8 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -318,7 +318,7 @@ public class Launcher extends BaseDraggingActivity
             if (!internalStateHandled) {
                 // If we are not binding synchronously, show a fade in animation when
                 // the first page bind completes.
-                mDragLayer.setAlpha(0);
+                mLauncherView.setAlpha(0);
             }
         } else {
             // Pages bound synchronously.
@@ -2131,8 +2131,8 @@ public class Launcher extends BaseDraggingActivity
 
     @Override
     public void finishFirstPageBind(final ViewOnDrawExecutor executor) {
-        if (mDragLayer.getAlpha() < 1) {
-            mDragLayer.animate().alpha(1).withEndAction(
+        if (mLauncherView.getAlpha() < 1) {
+            mLauncherView.animate().alpha(1).withEndAction(
                     executor == null ? null : executor::onLoadAnimationCompleted).start();
         } else if (executor != null) {
             executor.onLoadAnimationCompleted();