Merge "Fix crash in LauncherBackAnimationController" into main

2023-11-28 20:34:10 +00:00
parent 812bc2a9c5 e36c615716
commit b4f33ab7bb
1 changed files with 5 additions and 1 deletions
@@ -487,10 +487,14 @@ public class LauncherBackAnimationController {
                tryFinishBackAnimation();
            }
        });
+        if (mScrimLayer == null) {
+            // Scrim hasn't been attached yet. Let's attach it.
+            addScrimLayer();
+        }
        mScrimAlphaAnimator = new ValueAnimator().ofFloat(1, 0);
        mScrimAlphaAnimator.addUpdateListener(animation -> {
            float value = (Float) animation.getAnimatedValue();
-            if (mScrimLayer.isValid()) {
+            if (mScrimLayer != null && mScrimLayer.isValid()) {
                mTransaction.setAlpha(mScrimLayer, value * mScrimAlpha);
                mTransaction.apply();
            }