openkylin
/
platform_packages_apps_Launcher3
mirror of https://gitee.com/openkylin/platform_packages_apps_launcher3.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

This reverts commit dad8d4434d.

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

Change-Id: If3e2a8e0965d40924a475f077d3c42e64d4d382d
This commit is contained in:
Jonathan Miranda 2019-01-16 19:20:10 +00:00
parent dad8d4434d
commit 45d9c63d0b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java
View File

@ -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() {