Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dad8d443 authored by Jon Miranda's avatar Jon Miranda
Browse files

Remove scrim fade animation when returning to launcher. 

Since the DragLayer translates downwards, we no longer need the scrim fade
animation to avoid the hard scrim line.

Bug: 117677608
Change-Id: I4cd524d798579289d61bfe296f6de42bd22b0cb7
parent 876e462f

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

+4 −4
Original line number Diff line number Diff line
@@ -420,7 +420,10 @@ public class LauncherAppTransitionManagerImpl extends LauncherAppTransitionManag 
            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 @@ public class LauncherAppTransitionManagerImpl extends LauncherAppTransitionManag 
            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 @@ public class LauncherAppTransitionManagerImpl extends LauncherAppTransitionManag 
        mDragLayerAlpha.setValue(1f);

        mDragLayer.setLayerType(View.LAYER_TYPE_NONE, null);

        mDragLayer.setTranslationY(0f);

        mDragLayer.getScrim().hideSysUiScrim(false);

    }



    private boolean hasControlRemoteAppTransitionPermission() {