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

Commit 45d9c63d authored by Jonathan Miranda's avatar Jonathan Miranda
Browse files

Revert "Remove scrim fade animation when returning to launcher." 

This reverts commit dad8d443.

Reason for revert: Bottom scrim is still visible so it creates a hard line when animation starts

Change-Id: If3e2a8e0965d40924a475f077d3c42e64d4d382d
parent dad8d443

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

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

    }
@@ -797,6 +794,8 @@ 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);
@@ -816,6 +815,7 @@ 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() {