commit 71170d7b160d7a08bd0a3c0a632b698555d7501c
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Nov 05 23:55:37 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Nov 05 23:55:37 2018 +0000
tree 89976c043db7bbbd52cc5188dd2d6219d66f54d6
parent dad8d4434d3fad9856ad607848872d87e642e997
parent 1baf8a78c67b8bc01fb1064f758bda5c4b66ccc6

Merge "Create a launcher LoaderResults override." 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 d7bbfe0..9e85469 100644
--- a/quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java
+++ b/quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java
@@ -420,7 +420,10 @@
             mLauncher.getWorkspace().getPageIndicator().pauseAnimations();
             mDragLayer.setLayerType(View.LAYER_TYPE_HARDWARE, null);
 
-            endListener = this::resetContentView;
+            endListener = () -> {
+                resetContentView();
+                mDragLayer.getScrim().hideSysUiScrim(false);
+            };
         }
         return new Pair<>(launcherAnimator, endListener);
     }
@@ -794,8 +797,6 @@
             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);
@@ -815,7 +816,6 @@
         mDragLayerAlpha.setValue(1f);
         mDragLayer.setLayerType(View.LAYER_TYPE_NONE, null);
         mDragLayer.setTranslationY(0f);
-        mDragLayer.getScrim().hideSysUiScrim(false);
     }
 
     private boolean hasControlRemoteAppTransitionPermission() {