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

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

This commit is contained in:
Jonathan Miranda 2019-01-22 21:12:37 +00:00 committed by Android (Google) Code Review
parent c652afc0d9 45d9c63d0b
commit 494963c74a
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

@ -429,10 +429,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);
}
@ -877,6 +874,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);
@ -896,6 +895,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() {