aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-27 15:26:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Fix scrim attachment and detachment issues." into main

Browse Source
This commit is contained in:
Shan Huang
2023-10-16 17:17:14 +00:00
committed by Android (Google) Code Review
parent 7365f575e1 b78f7de733
commit 90f17d44d2
1 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
quickstep/src/com/android/quickstep/LauncherBackAnimationController.java
View File

@@ -185,6 +185,13 @@ public class LauncherBackAnimationController {
@Override
public void onBackProgressed(BackMotionEvent backMotionEvent) {
mHandler.post(() -> {
LauncherBackAnimationController controller = mControllerRef.get();
if (controller == null
|| controller.mLauncher == null
|| !controller.mLauncher.isStarted()) {
// Skip animating back progress if Launcher isn't visible yet.
return;
}
mProgressAnimator.onBackProgressed(backMotionEvent);
});
}
@@ -294,6 +301,10 @@ public class LauncherBackAnimationController {
SurfaceControl parent = viewRootImpl != null
? viewRootImpl.getSurfaceControl()
: null;
if (parent == null || !parent.isValid()) {
// Parent surface is not ready at the moment. Retry later.
return;
}
boolean isDarkTheme = Utilities.isDarkTheme(mLauncher);
mScrimLayer = new SurfaceControl.Builder()
.setName("Back to launcher background scrim")
@@ -326,6 +337,10 @@ public class LauncherBackAnimationController {
if (!mBackInProgress || mBackTarget == null) {
return;
}
if (mScrimLayer == null) {
// Scrim hasn't been attached yet. Let's attach it.
addScrimLayer();
}
float screenWidth = mStartRect.width();
float screenHeight = mStartRect.height();
float width = Utilities.mapRange(progress, 1, MIN_WINDOW_SCALE) * screenWidth;
@@ -446,6 +461,9 @@ public class LauncherBackAnimationController {
mScrimAlphaAnimator.cancel();
mScrimAlphaAnimator = null;
}
if (mScrimLayer != null) {
removeScrimLayer();
}
}
private void startTransitionAnimations(RectFSpringAnim springAnim, AnimatorSet anim) {