commit 494963c74a9be2ac07a946b7471cab508d65ef85
author Jonathan Miranda <jonmiranda@google.com> Tue Jan 22 21:12:37 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jan 22 21:12:37 2019 +0000
tree ac73bda825683ec9ebd143a0c724e498b7fb5167
parent c652afc0d9fc61c3166886078c917d566be82cdc
parent 45d9c63d0b2d382709ab158b36ab80ecfc4913c6

Merge "Revert "Remove scrim fade animation when returning to launcher."" into ub-launcher3-master

quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java

diff --git a/quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java b/quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java
index cb5152a..264ad5a 100644
--- a/quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java
+++ b/quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java
@@ -429,10 +429,7 @@
             mLauncher.getWorkspace().getPageIndicator().pauseAnimations();
             mDragLayer.setLayerType(View.LAYER_TYPE_HARDWARE, null);
 
-            endListener = () -> {
-                resetContentView();
-                mDragLayer.getScrim().hideSysUiScrim(false);
-            };
+            endListener = this::resetContentView;
         }
         return new Pair<>(launcherAnimator, endListener);
     }
@@ -877,6 +874,8 @@
             workspaceAnimator.setDuration(333);
             workspaceAnimator.setInterpolator(Interpolators.DEACCEL_1_7);
 
+            mDragLayer.getScrim().hideSysUiScrim(true);
+
             // Pause page indicator animations as they lead to layer trashing.
             mLauncher.getWorkspace().getPageIndicator().pauseAnimations();
             mDragLayer.setLayerType(View.LAYER_TYPE_HARDWARE, null);
@@ -896,6 +895,7 @@
         mDragLayerAlpha.setValue(1f);
         mDragLayer.setLayerType(View.LAYER_TYPE_NONE, null);
         mDragLayer.setTranslationY(0f);
+        mDragLayer.getScrim().hideSysUiScrim(false);
     }
 
     private boolean hasControlRemoteAppTransitionPermission() {