commit 3adb0b9f2a0454611e4d57d8cca48a2e98724cc1
author android-build-team Robot <android-build-team-robot@google.com> Tue May 01 20:59:00 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue May 01 20:59:00 2018 +0000
tree 589f71aef6012563d67e5c4d7f0c970937d08f68
parent 976047647e40e972371a9b1f4d1a065d1985605c
parent dbd9286abd8f90b9fa4c01a7f9c5a212adff877c

Merge "Fade in LauncherRootView in finishFirstPageBind." into ub-launcher3-edmonton

src/com/android/launcher3/Launcher.java

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 2c08169..af4faa8 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -318,7 +318,7 @@
             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 @@
 
     @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();