Show bouncer over dream.

This changelist allows the keyguard bouncer to be dragged up from the bottom of the screen over dreams. This interaction is accomplished by controlling the expansion of the keyguard view directly, allowing it to appear independently of the rest of the NotificationViewPanel.

Test: atest BouncerSwipeTouchHandlerTest
Bug: 211506329
Change-Id: I513d64e26b634b4e15bf1ba00af5e36e6df70eee

16 files changed, 726 insertions, 25 deletions

diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml
index cf631cd2c37c..343da26b3768 100644
--- a/packages/SystemUI/res/values/dimens.xml
+++ b/packages/SystemUI/res/values/dimens.xml
@@ -1371,4 +1371,9 @@
     <item name="dream_overlay_complication_guide_top_percent" format="float" type="dimen">
         0.10
     </item>
+
+    <!-- The percentage of the screen from which a swipe can start to reveal the bouncer. -->
+    <item name="dream_overlay_bouncer_start_region_screen_percentage" format="float" type="dimen">
+        .2
+    </item>
 </resources>
diff --git a/packages/SystemUI/src/com/android/systemui/dreams/dagger/DreamOverlayModule.java b/packages/SystemUI/src/com/android/systemui/dreams/dagger/DreamOverlayModule.java
index 503817a23f7f..4eb5cb97607a 100644
--- a/packages/SystemUI/src/com/android/systemui/dreams/dagger/DreamOverlayModule.java
+++ b/packages/SystemUI/src/com/android/systemui/dreams/dagger/DreamOverlayModule.java
@@ -34,7 +34,6 @@ import com.android.systemui.broadcast.BroadcastDispatcher;
 import com.android.systemui.dagger.qualifiers.Main;
 import com.android.systemui.dreams.DreamOverlayContainerView;
 import com.android.systemui.dreams.DreamOverlayStatusBarView;
-import com.android.systemui.dreams.touch.DreamTouchHandler;
 import com.android.systemui.statusbar.policy.BatteryController;
 import com.android.systemui.statusbar.policy.ConfigurationController;
 import com.android.systemui.tuner.TunerService;
@@ -44,7 +43,6 @@ import javax.inject.Named;
 import dagger.Lazy;
 import dagger.Module;
 import dagger.Provides;
-import dagger.multibindings.IntoSet;
 
 /** Dagger module for {@link DreamOverlayComponent}. */
 @Module
@@ -149,12 +147,4 @@ public abstract class DreamOverlayModule {
     static Lifecycle providesLifecycle(LifecycleOwner lifecycleOwner) {
         return lifecycleOwner.getLifecycle();
     }
-
-    // TODO: This stub should be removed once there is a {@link DreamTouchHandler}
-    // implementation present.
-    @Provides
-    @IntoSet
-    static DreamTouchHandler provideDreamTouchHandler() {
-        return session -> { };
-    }
 }
diff --git a/packages/SystemUI/src/com/android/systemui/dreams/touch/BouncerSwipeTouchHandler.java b/packages/SystemUI/src/com/android/systemui/dreams/touch/BouncerSwipeTouchHandler.java
new file mode 100644
index 000000000000..d16c8c8c59d6
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/dreams/touch/BouncerSwipeTouchHandler.java
@@ -0,0 +1,273 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.dreams.touch;
+
+import static com.android.systemui.dreams.touch.dagger.BouncerSwipeModule.SWIPE_TO_BOUNCER_FLING_ANIMATION_UTILS_CLOSING;
+import static com.android.systemui.dreams.touch.dagger.BouncerSwipeModule.SWIPE_TO_BOUNCER_FLING_ANIMATION_UTILS_OPENING;
+import static com.android.systemui.dreams.touch.dagger.BouncerSwipeModule.SWIPE_TO_BOUNCER_START_REGION;
+
+import android.animation.ValueAnimator;
+import android.util.Log;
+import android.view.GestureDetector;
+import android.view.InputEvent;
+import android.view.MotionEvent;
+import android.view.VelocityTracker;
+
+import com.android.systemui.statusbar.NotificationShadeWindowController;
+import com.android.systemui.statusbar.phone.KeyguardBouncer;
+import com.android.systemui.statusbar.phone.StatusBar;
+import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager;
+import com.android.wm.shell.animation.FlingAnimationUtils;
+
+import javax.inject.Inject;
+import javax.inject.Named;
+
+/**
+ * Monitor for tracking touches on the DreamOverlay to bring up the bouncer.
+ */
+public class BouncerSwipeTouchHandler implements DreamTouchHandler {
+    /**
+     * An interface for creating ValueAnimators.
+     */
+    public interface ValueAnimatorCreator {
+        /**
+         * Creates {@link ValueAnimator}.
+         */
+        ValueAnimator create(float start, float finish);
+    }
+
+    /**
+     * An interface for obtaining VelocityTrackers.
+     */
+    public interface VelocityTrackerFactory {
+        /**
+         * Obtains {@link VelocityTracker}.
+         */
+        VelocityTracker obtain();
+    }
+
+    public static final float FLING_PERCENTAGE_THRESHOLD = 0.5f;
+
+    private static final String TAG = "BouncerSwipeTouchHandler";
+    private final NotificationShadeWindowController mNotificationShadeWindowController;
+    private final float mBouncerZoneScreenPercentage;
+
+    private StatusBarKeyguardViewManager mStatusBarKeyguardViewManager;
+    private float mCurrentExpansion;
+    private final StatusBar mStatusBar;
+
+    private VelocityTracker mVelocityTracker;
+
+    private final FlingAnimationUtils mFlingAnimationUtils;
+    private final FlingAnimationUtils mFlingAnimationUtilsClosing;
+
+    private Boolean mCapture;
+
+    private TouchSession mTouchSession;
+
+    private ValueAnimatorCreator mValueAnimatorCreator;
+
+    private VelocityTrackerFactory mVelocityTrackerFactory;
+
+    private final GestureDetector.OnGestureListener mOnGestureListener =
+            new  GestureDetector.SimpleOnGestureListener() {
+                boolean mTrack;
+                boolean mBouncerPresent;
+
+                @Override
+                public boolean onDown(MotionEvent e) {
+                    // We only consider gestures that originate from the lower portion of the
+                    // screen.
+                    final float displayHeight = mStatusBar.getDisplayHeight();
+
+                    mBouncerPresent = mStatusBar.isBouncerShowing();
+
+                    // The target zone is either at the top or bottom of the screen, dependent on
+                    // whether the bouncer is present.
+                    final float zonePercentage =
+                            Math.abs(e.getY() - (mBouncerPresent ? 0 : displayHeight))
+                                    / displayHeight;
+
+                    mTrack =  zonePercentage < mBouncerZoneScreenPercentage;
+
+                    // Never capture onDown. While this might lead to some false positive touches
+                    // being sent to other windows/layers, this is necessary to make sure the
+                    // proper touch event sequence is received by others in the event we do not
+                    // consume the sequence here.
+                    return false;
+                }
+
+                @Override
+                public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX,
+                        float distanceY) {
+                    // Do not handle scroll gestures if not tracking touch events.
+                    if (!mTrack) {
+                        return false;
+                    }
+
+                    if (mCapture == null) {
+                        // If the user scrolling favors a vertical direction, begin capturing
+                        // scrolls.
+                        mCapture = Math.abs(distanceY) > Math.abs(distanceX);
+
+                        if (mCapture) {
+                            // Since the user is dragging the bouncer up, set scrimmed to false.
+                            mStatusBarKeyguardViewManager.showBouncer(false);
+                        }
+                    }
+
+                    if (!mCapture) {
+                        return false;
+                    }
+
+                    // For consistency, we adopt the expansion definition found in the
+                    // PanelViewController. In this case, expansion refers to the view above the
+                    // bouncer. As that view's expansion shrinks, the bouncer appears. The bouncer
+                    // is fully hidden at full expansion (1) and fully visible when fully collapsed
+                    // (0).
+                    final float screenTravelPercentage =
+                            Math.abs((e1.getY() - e2.getY()) / mStatusBar.getDisplayHeight());
+                    setPanelExpansion(
+                            mBouncerPresent ? screenTravelPercentage : 1 - screenTravelPercentage);
+
+                    return true;
+                }
+            };
+
+    private void setPanelExpansion(float expansion) {
+        mCurrentExpansion = expansion;
+        mStatusBarKeyguardViewManager.onPanelExpansionChanged(mCurrentExpansion, false, true);
+    }
+
+    @Inject
+    public BouncerSwipeTouchHandler(
+            StatusBarKeyguardViewManager statusBarKeyguardViewManager,
+            StatusBar statusBar,
+            NotificationShadeWindowController notificationShadeWindowController,
+            ValueAnimatorCreator valueAnimatorCreator,
+            VelocityTrackerFactory velocityTrackerFactory,
+            @Named(SWIPE_TO_BOUNCER_FLING_ANIMATION_UTILS_CLOSING)
+                    FlingAnimationUtils flingAnimationUtils,
+            @Named(SWIPE_TO_BOUNCER_FLING_ANIMATION_UTILS_OPENING)
+                    FlingAnimationUtils flingAnimationUtilsClosing,
+            @Named(SWIPE_TO_BOUNCER_START_REGION) float swipeRegionPercentage) {
+        mStatusBar = statusBar;
+        mStatusBarKeyguardViewManager = statusBarKeyguardViewManager;
+        mNotificationShadeWindowController = notificationShadeWindowController;
+        mBouncerZoneScreenPercentage = swipeRegionPercentage;
+        mFlingAnimationUtils = flingAnimationUtils;
+        mFlingAnimationUtilsClosing = flingAnimationUtilsClosing;
+        mValueAnimatorCreator = valueAnimatorCreator;
+        mVelocityTrackerFactory = velocityTrackerFactory;
+    }
+
+    @Override
+    public void onSessionStart(TouchSession session) {
+        mVelocityTracker = mVelocityTrackerFactory.obtain();
+        mTouchSession = session;
+        mVelocityTracker.clear();
+        mNotificationShadeWindowController.setForcePluginOpen(true, this);
+        session.registerGestureListener(mOnGestureListener);
+        session.registerInputListener(ev -> onMotionEvent(ev));
+
+    }
+
+    @Override
+    public void onSessionEnd(TouchSession session) {
+        mVelocityTracker.recycle();
+        mCapture = null;
+        mNotificationShadeWindowController.setForcePluginOpen(false, this);
+    }
+
+    private void onMotionEvent(InputEvent event) {
+        if (!(event instanceof MotionEvent)) {
+            Log.e(TAG, "non MotionEvent received:" + event);
+            return;
+        }
+
+        final MotionEvent motionEvent = (MotionEvent) event;
+
+        switch(motionEvent.getAction()) {
+            case MotionEvent.ACTION_UP:
+                // If we are not capturing any input, there is no need to consider animating to
+                // finish transition.
+                if (mCapture == null || !mCapture) {
+                    break;
+                }
+
+                // We must capture the resulting velocities as resetMonitor() will clear these
+                // values.
+                mVelocityTracker.computeCurrentVelocity(1000);
+                final float verticalVelocity = mVelocityTracker.getYVelocity();
+                final float horizontalVelocity = mVelocityTracker.getXVelocity();
+
+                final float velocityVector =
+                        (float) Math.hypot(horizontalVelocity, verticalVelocity);
+
+
+                final float expansion = flingRevealsOverlay(verticalVelocity, velocityVector)
+                            ? KeyguardBouncer.EXPANSION_HIDDEN : KeyguardBouncer.EXPANSION_VISIBLE;
+                flingToExpansion(verticalVelocity, expansion);
+
+                if (expansion == KeyguardBouncer.EXPANSION_HIDDEN) {
+                    mStatusBarKeyguardViewManager.reset(false);
+                }
+                mTouchSession.pop();
+                break;
+            default:
+                mVelocityTracker.addMovement(motionEvent);
+                break;
+        }
+    }
+
+    private ValueAnimator createExpansionAnimator(float targetExpansion) {
+        final ValueAnimator animator =
+                mValueAnimatorCreator.create(mCurrentExpansion, targetExpansion);
+        animator.addUpdateListener(
+                animation -> {
+                    setPanelExpansion((float) animation.getAnimatedValue());
+                });
+        return animator;
+    }
+
+    protected boolean flingRevealsOverlay(float velocity, float velocityVector) {
+        // Fully expand if the user has expanded the bouncer less than halfway or final velocity was
+        // positive, indicating an downward direction.
+        if (Math.abs(velocityVector) < mFlingAnimationUtils.getMinVelocityPxPerSecond()) {
+            return mCurrentExpansion > FLING_PERCENTAGE_THRESHOLD;
+        } else {
+            return velocity > 0;
+        }
+    }
+
+    protected void flingToExpansion(float velocity, float expansion) {
+        final float viewHeight = mStatusBar.getDisplayHeight();
+        final float currentHeight = viewHeight * mCurrentExpansion;
+        final float targetHeight = viewHeight * expansion;
+
+        final ValueAnimator animator = createExpansionAnimator(expansion);
+        if (expansion == KeyguardBouncer.EXPANSION_HIDDEN) {
+            // The animation utils deal in pixel units, rather than expansion height.
+            mFlingAnimationUtils.apply(animator, currentHeight, targetHeight, velocity, viewHeight);
+        } else {
+            mFlingAnimationUtilsClosing.apply(
+                    animator, mCurrentExpansion, currentHeight, targetHeight, viewHeight);
+        }
+
+        animator.start();
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/dreams/touch/dagger/BouncerSwipeModule.java b/packages/SystemUI/src/com/android/systemui/dreams/touch/dagger/BouncerSwipeModule.java
new file mode 100644
index 000000000000..b9436f96c74f
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/dreams/touch/dagger/BouncerSwipeModule.java
@@ -0,0 +1,128 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.dreams.touch.dagger;
+
+import android.animation.ValueAnimator;
+import android.content.res.Resources;
+import android.util.TypedValue;
+import android.view.VelocityTracker;
+
+import com.android.systemui.R;
+import com.android.systemui.dagger.qualifiers.Main;
+import com.android.systemui.dreams.touch.BouncerSwipeTouchHandler;
+import com.android.systemui.dreams.touch.DreamTouchHandler;
+import com.android.systemui.statusbar.phone.PanelViewController;
+import com.android.wm.shell.animation.FlingAnimationUtils;
+
+import javax.inject.Named;
+import javax.inject.Provider;
+
+import dagger.Module;
+import dagger.Provides;
+import dagger.multibindings.IntoSet;
+
+/**
+ * This module captures the components associated with {@link BouncerSwipeTouchHandler}.
+ */
+@Module
+public class BouncerSwipeModule {
+    /**
+     * The region, defined as the percentage of the screen, from which a touch gesture to start
+     * swiping up to the bouncer can occur.
+     */
+    public static final String SWIPE_TO_BOUNCER_START_REGION = "swipe_to_bouncer_start_region";
+
+    /**
+     * The {@link android.view.animation.AnimationUtils} for animating the bouncer closing.
+     */
+    public static final String SWIPE_TO_BOUNCER_FLING_ANIMATION_UTILS_CLOSING =
+            "swipe_to_bouncer_fling_animation_utils_closing";
+
+    /**
+     * The {@link android.view.animation.AnimationUtils} for animating the bouncer opening.
+     */
+    public static final String SWIPE_TO_BOUNCER_FLING_ANIMATION_UTILS_OPENING =
+                    "swipe_to_bouncer_fling_animation_utils_opening";
+
+    /**
+     * Provides {@link BouncerSwipeTouchHandler} for inclusion in touch handling over the dream.
+     */
+    @Provides
+    @IntoSet
+    public static DreamTouchHandler providesBouncerSwipeTouchHandler(
+            BouncerSwipeTouchHandler touchHandler) {
+        return touchHandler;
+    }
+
+    /**
+     * Provides {@link android.view.animation.AnimationUtils} for closing.
+     */
+    @Provides
+    @Named(SWIPE_TO_BOUNCER_FLING_ANIMATION_UTILS_CLOSING)
+    public static FlingAnimationUtils providesSwipeToBouncerFlingAnimationUtilsClosing(
+            Provider<FlingAnimationUtils.Builder> flingAnimationUtilsBuilderProvider) {
+        return flingAnimationUtilsBuilderProvider.get()
+                .reset()
+                .setMaxLengthSeconds(PanelViewController.FLING_CLOSING_MAX_LENGTH_SECONDS)
+                .setSpeedUpFactor(PanelViewController.FLING_SPEED_UP_FACTOR)
+                .build();
+    }
+
+    /**
+     * Provides {@link android.view.animation.AnimationUtils} for opening.
+     */
+    @Provides
+    @Named(SWIPE_TO_BOUNCER_FLING_ANIMATION_UTILS_OPENING)
+    public static FlingAnimationUtils providesSwipeToBouncerFlingAnimationUtilsOpening(
+            Provider<FlingAnimationUtils.Builder> flingAnimationUtilsBuilderProvider) {
+        return flingAnimationUtilsBuilderProvider.get()
+                .reset()
+                .setMaxLengthSeconds(PanelViewController.FLING_MAX_LENGTH_SECONDS)
+                .setSpeedUpFactor(PanelViewController.FLING_SPEED_UP_FACTOR)
+                .build();
+    }
+
+    /**
+     * Provides the region to start swipe gestures from.
+     */
+    @Provides
+    @Named(SWIPE_TO_BOUNCER_START_REGION)
+    public static float providesSwipeToBouncerStartRegion(@Main Resources resources) {
+        TypedValue typedValue = new TypedValue();
+        resources.getValue(R.dimen.dream_overlay_bouncer_start_region_screen_percentage,
+                typedValue, true);
+        return typedValue.getFloat();
+    }
+
+    /**
+     * Provides the default {@link BouncerSwipeTouchHandler.ValueAnimatorCreator}, which is simply
+     * a wrapper around {@link ValueAnimator}.
+     */
+    @Provides
+    public static BouncerSwipeTouchHandler.ValueAnimatorCreator providesValueAnimatorCreator() {
+        return (start, finish) -> ValueAnimator.ofFloat(start, finish);
+    }
+
+    /**
+     * Provides the default {@link BouncerSwipeTouchHandler.VelocityTrackerFactory}. which is a
+     * passthrough to {@link android.view.VelocityTracker}.
+     */
+    @Provides
+    public static BouncerSwipeTouchHandler.VelocityTrackerFactory providesVelocityTrackerFactory() {
+        return () -> VelocityTracker.obtain();
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/dreams/touch/dagger/DreamTouchModule.java b/packages/SystemUI/src/com/android/systemui/dreams/touch/dagger/DreamTouchModule.java
index 7b77b593b330..dad0004613f6 100644
--- a/packages/SystemUI/src/com/android/systemui/dreams/touch/dagger/DreamTouchModule.java
+++ b/packages/SystemUI/src/com/android/systemui/dreams/touch/dagger/DreamTouchModule.java
@@ -21,8 +21,10 @@ import dagger.Module;
 /**
  * {@link DreamTouchModule} encapsulates dream touch-related components.
  */
-@Module(subcomponents = {
-        InputSessionComponent.class,
+@Module(includes = {
+            BouncerSwipeModule.class,
+        }, subcomponents = {
+            InputSessionComponent.class,
 })
 public interface DreamTouchModule {
     String INPUT_SESSION_NAME = "INPUT_SESSION_NAME";
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
index 701d1391d271..79e50cd3dd37 100644
--- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
@@ -106,6 +106,7 @@ import com.android.systemui.animation.Interpolators;
 import com.android.systemui.broadcast.BroadcastDispatcher;
 import com.android.systemui.classifier.FalsingCollector;
 import com.android.systemui.dagger.qualifiers.UiBackground;
+import com.android.systemui.dreams.DreamOverlayStateController;
 import com.android.systemui.dump.DumpManager;
 import com.android.systemui.keyguard.dagger.KeyguardModule;
 import com.android.systemui.navigationbar.NavigationModeController;
@@ -233,6 +234,7 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable,
      * keyguard to show even if it is disabled for the current user.
      */
     public static final String OPTION_FORCE_SHOW = "force_show";
+    private final DreamOverlayStateController mDreamOverlayStateController;
 
     /** The stream type that the lock sounds are tied to. */
     private int mUiSoundsStreamType;
@@ -291,6 +293,9 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable,
     // AOD is enabled and status bar is in AOD state.
     private boolean mAodShowing;
 
+    // Dream overlay is visible.
+    private boolean mDreamOverlayShowing;
+
     /** Cached value of #isInputRestricted */
     private boolean mInputRestricted;
 
@@ -470,6 +475,14 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable,
             }
     };
 
+    private final DreamOverlayStateController.Callback mDreamOverlayStateCallback =
+            new DreamOverlayStateController.Callback() {
+                @Override
+                public void onStateChanged() {
+                    mDreamOverlayShowing = mDreamOverlayStateController.isOverlayActive();
+                }
+            };
+
     KeyguardUpdateMonitorCallback mUpdateCallback = new KeyguardUpdateMonitorCallback() {
 
         @Override
@@ -836,6 +849,7 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable,
             Lazy<NotificationShadeDepthController> notificationShadeDepthController,
             ScreenOnCoordinator screenOnCoordinator,
             InteractionJankMonitor interactionJankMonitor,
+            DreamOverlayStateController dreamOverlayStateController,
             Lazy<NotificationShadeWindowController> notificationShadeWindowControllerLazy) {
         super(context);
         mFalsingCollector = falsingCollector;
@@ -875,6 +889,7 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable,
         mKeyguardUnlockAnimationControllerLazy = keyguardUnlockAnimationControllerLazy;
         mScreenOffAnimationController = screenOffAnimationController;
         mInteractionJankMonitor = interactionJankMonitor;
+        mDreamOverlayStateController = dreamOverlayStateController;
     }
 
     public void userActivity() {
@@ -980,6 +995,7 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable,
             mSystemReady = true;
             doKeyguardLocked(null);
             mUpdateMonitor.registerCallback(mUpdateCallback);
+            mDreamOverlayStateController.addCallback(mDreamOverlayStateCallback);
         }
         // Most services aren't available until the system reaches the ready state, so we
         // send it here when the device first boots.
@@ -2123,7 +2139,7 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable,
         Trace.beginSection("KeyguardViewMediator#handleHide");
 
         // It's possible that the device was unlocked in a dream state. It's time to wake up.
-        if (mAodShowing) {
+        if (mAodShowing || mDreamOverlayShowing) {
             PowerManager pm = mContext.getSystemService(PowerManager.class);
             pm.wakeUp(SystemClock.uptimeMillis(), PowerManager.WAKE_REASON_GESTURE,
                     "com.android.systemui:BOUNCER_DOZING");
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/dagger/KeyguardModule.java b/packages/SystemUI/src/com/android/systemui/keyguard/dagger/KeyguardModule.java
index f14d13093620..b49b49cbbb6d 100644
--- a/packages/SystemUI/src/com/android/systemui/keyguard/dagger/KeyguardModule.java
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/dagger/KeyguardModule.java
@@ -37,6 +37,7 @@ import com.android.systemui.classifier.FalsingCollector;
 import com.android.systemui.classifier.FalsingModule;
 import com.android.systemui.dagger.SysUISingleton;
 import com.android.systemui.dagger.qualifiers.UiBackground;
+import com.android.systemui.dreams.DreamOverlayStateController;
 import com.android.systemui.dump.DumpManager;
 import com.android.systemui.keyguard.DismissCallbackRegistry;
 import com.android.systemui.keyguard.KeyguardUnlockAnimationController;
@@ -100,6 +101,7 @@ public class KeyguardModule {
             Lazy<NotificationShadeDepthController> notificationShadeDepthController,
             ScreenOnCoordinator screenOnCoordinator,
             InteractionJankMonitor interactionJankMonitor,
+            DreamOverlayStateController dreamOverlayStateController,
             Lazy<NotificationShadeWindowController> notificationShadeWindowController) {
         return new KeyguardViewMediator(
                 context,
@@ -125,6 +127,7 @@ public class KeyguardModule {
                 notificationShadeDepthController,
                 screenOnCoordinator,
                 interactionJankMonitor,
+                dreamOverlayStateController,
                 notificationShadeWindowController
         );
     }
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java
index 9d3f19ad039a..bb0ed95cc6ca 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java
@@ -4188,9 +4188,10 @@ public class NotificationPanelViewController extends PanelViewController
                     return false;
                 }
 
-                // Do not allow panel expansion if bouncer is scrimmed, otherwise user would be able
-                // to pull down QS or expand the shade.
-                if (mStatusBar.isBouncerShowingScrimmed()) {
+                // Do not allow panel expansion if bouncer is scrimmed or showing over a dream,
+                // otherwise user would be able to pull down QS or expand the shade.
+                if (mStatusBar.isBouncerShowingScrimmed()
+                        || mStatusBar.isBouncerShowingOverDream()) {
                     return false;
                 }
 
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelViewController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelViewController.java
index dc6efba97ff5..c466a8ce6d3f 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelViewController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelViewController.java
@@ -73,6 +73,10 @@ import java.io.PrintWriter;
 public abstract class PanelViewController {
     public static final boolean DEBUG = PanelView.DEBUG;
     public static final String TAG = PanelView.class.getSimpleName();
+    public static final float FLING_MAX_LENGTH_SECONDS = 0.6f;
+    public static final float FLING_SPEED_UP_FACTOR = 0.6f;
+    public static final float FLING_CLOSING_MAX_LENGTH_SECONDS = 0.6f;
+    public static final float FLING_CLOSING_SPEED_UP_FACTOR = 0.6f;
     private static final int NO_FIXED_DURATION = -1;
     private static final long SHADE_OPEN_SPRING_OUT_DURATION = 350L;
     private static final long SHADE_OPEN_SPRING_BACK_DURATION = 400L;
@@ -269,13 +273,13 @@ public abstract class PanelViewController {
         mNotificationShadeWindowController = notificationShadeWindowController;
         mFlingAnimationUtils = flingAnimationUtilsBuilder
                 .reset()
-                .setMaxLengthSeconds(0.6f)
-                .setSpeedUpFactor(0.6f)
+                .setMaxLengthSeconds(FLING_MAX_LENGTH_SECONDS)
+                .setSpeedUpFactor(FLING_SPEED_UP_FACTOR)
                 .build();
         mFlingAnimationUtilsClosing = flingAnimationUtilsBuilder
                 .reset()
-                .setMaxLengthSeconds(0.5f)
-                .setSpeedUpFactor(0.6f)
+                .setMaxLengthSeconds(FLING_CLOSING_MAX_LENGTH_SECONDS)
+                .setSpeedUpFactor(FLING_CLOSING_SPEED_UP_FACTOR)
                 .build();
         mFlingAnimationUtilsDismissing = flingAnimationUtilsBuilder
                 .reset()
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
index c09c3ca9dede..a1445337e7d7 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
@@ -150,6 +150,7 @@ import com.android.systemui.dagger.qualifiers.Main;
 import com.android.systemui.dagger.qualifiers.UiBackground;
 import com.android.systemui.demomode.DemoMode;
 import com.android.systemui.demomode.DemoModeController;
+import com.android.systemui.dreams.DreamOverlayStateController;
 import com.android.systemui.emergency.EmergencyGesture;
 import com.android.systemui.flags.FeatureFlags;
 import com.android.systemui.flags.Flags;
@@ -338,6 +339,7 @@ public class StatusBar extends CoreStartable implements
     }
 
     private final LockscreenShadeTransitionController mLockscreenShadeTransitionController;
+    private final DreamOverlayStateController mDreamOverlayStateController;
     private StatusBarCommandQueueCallbacks mCommandQueueCallbacks;
 
     void onStatusBarWindowStateChanged(@WindowVisibleState int state) {
@@ -781,7 +783,8 @@ public class StatusBar extends CoreStartable implements
             ActivityLaunchAnimator activityLaunchAnimator,
             NotifPipelineFlags notifPipelineFlags,
             InteractionJankMonitor jankMonitor,
-            DeviceStateManager deviceStateManager) {
+            DeviceStateManager deviceStateManager,
+            DreamOverlayStateController dreamOverlayStateController) {
         super(context);
         mNotificationsController = notificationsController;
         mFragmentService = fragmentService;
@@ -869,6 +872,7 @@ public class StatusBar extends CoreStartable implements
         mMessageRouter = messageRouter;
         mWallpaperManager = wallpaperManager;
         mJankMonitor = jankMonitor;
+        mDreamOverlayStateController = dreamOverlayStateController;
 
         mLockscreenShadeTransitionController = lockscreenShadeTransitionController;
         mStartingSurfaceOptional = startingSurfaceOptional;
@@ -4144,6 +4148,10 @@ public class StatusBar extends CoreStartable implements
         return isBouncerShowing() && mStatusBarKeyguardViewManager.bouncerNeedsScrimming();
     }
 
+    public boolean isBouncerShowingOverDream() {
+        return isBouncerShowing() && mDreamOverlayStateController.isOverlayActive();
+    }
+
     /**
      * When {@link KeyguardBouncer} starts to be dismissed, playing its animation.
      */
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java
index 316e68227e0c..b20349667379 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java
@@ -51,6 +51,7 @@ import com.android.keyguard.ViewMediatorCallback;
 import com.android.systemui.DejankUtils;
 import com.android.systemui.dagger.SysUISingleton;
 import com.android.systemui.dock.DockManager;
+import com.android.systemui.dreams.DreamOverlayStateController;
 import com.android.systemui.navigationbar.NavigationBarView;
 import com.android.systemui.navigationbar.NavigationModeController;
 import com.android.systemui.plugins.statusbar.StatusBarStateController;
@@ -111,6 +112,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
     private final NotificationShadeWindowController mNotificationShadeWindowController;
     private final KeyguardBouncer.Factory mKeyguardBouncerFactory;
     private final KeyguardMessageAreaController.Factory mKeyguardMessageAreaFactory;
+    private final DreamOverlayStateController mDreamOverlayStateController;
     private KeyguardMessageAreaController mKeyguardMessageAreaController;
     private final Lazy<ShadeController> mShadeController;
     private final BouncerExpansionCallback mExpansionCallback = new BouncerExpansionCallback() {
@@ -235,6 +237,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
             SysuiStatusBarStateController sysuiStatusBarStateController,
             ConfigurationController configurationController,
             KeyguardUpdateMonitor keyguardUpdateMonitor,
+            DreamOverlayStateController dreamOverlayStateController,
             NavigationModeController navigationModeController,
             DockManager dockManager,
             NotificationShadeWindowController notificationShadeWindowController,
@@ -249,6 +252,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
         mConfigurationController = configurationController;
         mNavigationModeController = navigationModeController;
         mNotificationShadeWindowController = notificationShadeWindowController;
+        mDreamOverlayStateController = dreamOverlayStateController;
         mKeyguardStateController = keyguardStateController;
         mMediaManager = notificationMediaManager;
         mKeyguardUpdateManager = keyguardUpdateMonitor;
@@ -1174,7 +1178,9 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
     }
 
     public boolean bouncerNeedsScrimming() {
-        return mOccluded || mBouncer.willDismissWithAction()
+        // When a dream overlay is active, scrimming will cause any expansion to immediately expand.
+        return (mOccluded && !mDreamOverlayStateController.isOverlayActive())
+                || mBouncer.willDismissWithAction()
                 || mStatusBar.isFullScreenUserSwitcherState()
                 || (mBouncer.isShowing() && mBouncer.isScrimmed())
                 || mBouncer.isFullscreenBouncer();
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/dagger/StatusBarPhoneModule.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/dagger/StatusBarPhoneModule.java
index f5364b9363b9..d3ff4a78c893 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/dagger/StatusBarPhoneModule.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/dagger/StatusBarPhoneModule.java
@@ -40,6 +40,7 @@ import com.android.systemui.dagger.SysUISingleton;
 import com.android.systemui.dagger.qualifiers.Main;
 import com.android.systemui.dagger.qualifiers.UiBackground;
 import com.android.systemui.demomode.DemoModeController;
+import com.android.systemui.dreams.DreamOverlayStateController;
 import com.android.systemui.flags.FeatureFlags;
 import com.android.systemui.fragments.FragmentService;
 import com.android.systemui.keyguard.KeyguardUnlockAnimationController;
@@ -231,7 +232,8 @@ public interface StatusBarPhoneModule {
             ActivityLaunchAnimator activityLaunchAnimator,
             NotifPipelineFlags notifPipelineFlags,
             InteractionJankMonitor jankMonitor,
-            DeviceStateManager deviceStateManager) {
+            DeviceStateManager deviceStateManager,
+            DreamOverlayStateController dreamOverlayStateController) {
         return new StatusBar(
                 context,
                 notificationsController,
@@ -327,7 +329,8 @@ public interface StatusBarPhoneModule {
                 activityLaunchAnimator,
                 notifPipelineFlags,
                 jankMonitor,
-                deviceStateManager
+                deviceStateManager,
+                dreamOverlayStateController
         );
     }
 }
diff --git a/packages/SystemUI/tests/src/com/android/systemui/dreams/touch/BouncerSwipeTouchHandlerTest.java b/packages/SystemUI/tests/src/com/android/systemui/dreams/touch/BouncerSwipeTouchHandlerTest.java
new file mode 100644
index 000000000000..1a8326fd5bd1
--- /dev/null
+++ b/packages/SystemUI/tests/src/com/android/systemui/dreams/touch/BouncerSwipeTouchHandlerTest.java
@@ -0,0 +1,252 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.dreams.touch;
+
+import static com.google.common.truth.Truth.assertThat;
+
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.anyFloat;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.animation.ValueAnimator;
+import android.testing.AndroidTestingRunner;
+import android.view.GestureDetector;
+import android.view.MotionEvent;
+import android.view.VelocityTracker;
+
+import androidx.test.filters.SmallTest;
+
+import com.android.systemui.SysuiTestCase;
+import com.android.systemui.shared.system.InputChannelCompat;
+import com.android.systemui.statusbar.NotificationShadeWindowController;
+import com.android.systemui.statusbar.phone.KeyguardBouncer;
+import com.android.systemui.statusbar.phone.StatusBar;
+import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager;
+import com.android.wm.shell.animation.FlingAnimationUtils;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.MockitoAnnotations;
+
+import java.util.Random;
+
+@SmallTest
+@RunWith(AndroidTestingRunner.class)
+public class BouncerSwipeTouchHandlerTest extends SysuiTestCase {
+    @Mock
+    StatusBarKeyguardViewManager mStatusBarKeyguardViewManager;
+
+    @Mock
+    StatusBar mStatusBar;
+
+    @Mock
+    NotificationShadeWindowController mNotificationShadeWindowController;
+
+    @Mock
+    FlingAnimationUtils mFlingAnimationUtils;
+
+
+    @Mock
+    FlingAnimationUtils mFlingAnimationUtilsClosing;
+
+    @Mock
+    DreamTouchHandler.TouchSession mTouchSession;
+
+    BouncerSwipeTouchHandler mTouchHandler;
+
+    @Mock
+    BouncerSwipeTouchHandler.ValueAnimatorCreator mValueAnimatorCreator;
+
+    @Mock
+    ValueAnimator mValueAnimator;
+
+    @Mock
+    BouncerSwipeTouchHandler.VelocityTrackerFactory mVelocityTrackerFactory;
+
+    @Mock
+    VelocityTracker mVelocityTracker;
+
+    private static final float TOUCH_REGION = .3f;
+    private static final float SCREEN_HEIGHT_PX = 100;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        mTouchHandler = new BouncerSwipeTouchHandler(
+                mStatusBarKeyguardViewManager,
+                mStatusBar,
+                mNotificationShadeWindowController,
+                mValueAnimatorCreator,
+                mVelocityTrackerFactory,
+                mFlingAnimationUtils,
+                mFlingAnimationUtilsClosing,
+                TOUCH_REGION);
+        when(mStatusBar.getDisplayHeight()).thenReturn(SCREEN_HEIGHT_PX);
+        when(mValueAnimatorCreator.create(anyFloat(), anyFloat())).thenReturn(mValueAnimator);
+        when(mVelocityTrackerFactory.obtain()).thenReturn(mVelocityTracker);
+    }
+
+    private static void beginValidSwipe(GestureDetector.OnGestureListener listener) {
+        listener.onDown(MotionEvent.obtain(0, 0,
+                MotionEvent.ACTION_DOWN, 0,
+                SCREEN_HEIGHT_PX - (.5f * TOUCH_REGION * SCREEN_HEIGHT_PX), 0));
+    }
+
+    /**
+     * Ensures expansion only happens when touch down happens in valid part of the screen.
+     */
+    @Test
+    public void testSessionStart() {
+        mTouchHandler.onSessionStart(mTouchSession);
+        verify(mNotificationShadeWindowController).setForcePluginOpen(eq(true), any());
+        ArgumentCaptor<InputChannelCompat.InputEventListener> eventListenerCaptor =
+                ArgumentCaptor.forClass(InputChannelCompat.InputEventListener.class);
+        ArgumentCaptor<GestureDetector.OnGestureListener> gestureListenerCaptor =
+                ArgumentCaptor.forClass(GestureDetector.OnGestureListener.class);
+        verify(mTouchSession).registerGestureListener(gestureListenerCaptor.capture());
+        verify(mTouchSession).registerInputListener(eventListenerCaptor.capture());
+
+        final Random random = new Random(System.currentTimeMillis());
+
+        // If an initial touch down meeting criteria has been met, scroll behavior should be
+        // ignored.
+        assertThat(gestureListenerCaptor.getValue()
+                .onScroll(Mockito.mock(MotionEvent.class),
+                        Mockito.mock(MotionEvent.class),
+                        random.nextFloat(),
+                        random.nextFloat())).isFalse();
+
+        // A touch at the top of the screen should also not trigger listening.
+        final MotionEvent touchDownEvent = MotionEvent.obtain(0, 0, MotionEvent.ACTION_DOWN,
+                0, 0, 0);
+
+        gestureListenerCaptor.getValue().onDown(touchDownEvent);
+        assertThat(gestureListenerCaptor.getValue()
+                .onScroll(Mockito.mock(MotionEvent.class),
+                        Mockito.mock(MotionEvent.class),
+                        random.nextFloat(),
+                        random.nextFloat())).isFalse();
+
+        // A touch within range at the bottom of the screen should trigger listening
+        beginValidSwipe(gestureListenerCaptor.getValue());
+        assertThat(gestureListenerCaptor.getValue()
+                .onScroll(Mockito.mock(MotionEvent.class),
+                        Mockito.mock(MotionEvent.class),
+                        random.nextFloat(),
+                        random.nextFloat())).isTrue();
+    }
+
+    /**
+     * Makes sure expansion amount is proportional to scroll.
+     */
+    @Test
+    public void testExpansionAmount() {
+        mTouchHandler.onSessionStart(mTouchSession);
+        ArgumentCaptor<GestureDetector.OnGestureListener> gestureListenerCaptor =
+                ArgumentCaptor.forClass(GestureDetector.OnGestureListener.class);
+        verify(mTouchSession).registerGestureListener(gestureListenerCaptor.capture());
+
+        beginValidSwipe(gestureListenerCaptor.getValue());
+
+        final float scrollAmount = .3f;
+        final float distanceY = SCREEN_HEIGHT_PX * scrollAmount;
+
+        final MotionEvent event1 = MotionEvent.obtain(0, 0, MotionEvent.ACTION_MOVE,
+                0, SCREEN_HEIGHT_PX, 0);
+        final MotionEvent event2 = MotionEvent.obtain(0, 0, MotionEvent.ACTION_MOVE,
+                0, SCREEN_HEIGHT_PX  - distanceY, 0);
+
+        assertThat(gestureListenerCaptor.getValue().onScroll(event1, event2, 0 , distanceY))
+                .isTrue();
+
+        // Ensure only called once
+        verify(mStatusBarKeyguardViewManager)
+                .onPanelExpansionChanged(anyFloat(), anyBoolean(), anyBoolean());
+
+        // Ensure correct expansion passed in.
+        verify(mStatusBarKeyguardViewManager)
+                .onPanelExpansionChanged(eq(1 - scrollAmount), eq(false), eq(true));
+    }
+
+    private void swipeToPosition(float position, float velocityY) {
+        mTouchHandler.onSessionStart(mTouchSession);
+        ArgumentCaptor<GestureDetector.OnGestureListener> gestureListenerCaptor =
+                ArgumentCaptor.forClass(GestureDetector.OnGestureListener.class);
+        ArgumentCaptor<InputChannelCompat.InputEventListener> inputEventListenerCaptor =
+                ArgumentCaptor.forClass(InputChannelCompat.InputEventListener.class);
+        verify(mTouchSession).registerGestureListener(gestureListenerCaptor.capture());
+        verify(mTouchSession).registerInputListener(inputEventListenerCaptor.capture());
+
+        when(mVelocityTracker.getYVelocity()).thenReturn(velocityY);
+
+        beginValidSwipe(gestureListenerCaptor.getValue());
+
+        final float distanceY = SCREEN_HEIGHT_PX * position;
+
+        final MotionEvent event1 = MotionEvent.obtain(0, 0, MotionEvent.ACTION_MOVE,
+                0, SCREEN_HEIGHT_PX, 0);
+        final MotionEvent event2 = MotionEvent.obtain(0, 0, MotionEvent.ACTION_MOVE,
+                0, SCREEN_HEIGHT_PX  - distanceY, 0);
+
+        assertThat(gestureListenerCaptor.getValue().onScroll(event1, event2, 0 , distanceY))
+                .isTrue();
+
+        final MotionEvent upEvent = MotionEvent.obtain(0, 0, MotionEvent.ACTION_UP,
+                0, 0, 0);
+
+        inputEventListenerCaptor.getValue().onInputEvent(upEvent);
+    }
+
+    /**
+     * Tests that ending a swipe before the set expansion threshold leads to bouncer collapsing
+     * down.
+     */
+    @Test
+    public void testCollapseOnThreshold() {
+        final float swipeUpPercentage = .3f;
+        swipeToPosition(swipeUpPercentage, -1);
+
+        verify(mValueAnimatorCreator).create(eq(1 - swipeUpPercentage),
+                eq(KeyguardBouncer.EXPANSION_VISIBLE));
+        verify(mFlingAnimationUtilsClosing).apply(eq(mValueAnimator), anyFloat(), anyFloat(),
+                anyFloat(), anyFloat());
+        verify(mValueAnimator).start();
+    }
+
+    /**
+     * Tests that ending a swipe above the set expansion threshold will continue the expansion.
+     */
+    @Test
+    public void testExpandOnThreshold() {
+        final float swipeUpPercentage = .7f;
+        swipeToPosition(swipeUpPercentage, 1);
+
+        verify(mValueAnimatorCreator).create(eq(1 - swipeUpPercentage),
+                eq(KeyguardBouncer.EXPANSION_HIDDEN));
+        verify(mFlingAnimationUtils).apply(eq(mValueAnimator), anyFloat(), anyFloat(),
+                anyFloat(), anyFloat());
+        verify(mValueAnimator).start();
+    }
+}
diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/KeyguardViewMediatorTest.java b/packages/SystemUI/tests/src/com/android/systemui/keyguard/KeyguardViewMediatorTest.java
index da8ab27d7e3d..d94e2eee9ffa 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/KeyguardViewMediatorTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/keyguard/KeyguardViewMediatorTest.java
@@ -48,6 +48,7 @@ import com.android.keyguard.mediator.ScreenOnCoordinator;
 import com.android.systemui.SysuiTestCase;
 import com.android.systemui.broadcast.BroadcastDispatcher;
 import com.android.systemui.classifier.FalsingCollectorFake;
+import com.android.systemui.dreams.DreamOverlayStateController;
 import com.android.systemui.dump.DumpManager;
 import com.android.systemui.navigationbar.NavigationModeController;
 import com.android.systemui.statusbar.NotificationShadeDepthController;
@@ -98,6 +99,7 @@ public class KeyguardViewMediatorTest extends SysuiTestCase {
     private @Mock InteractionJankMonitor mInteractionJankMonitor;
     private @Mock ScreenOnCoordinator mScreenOnCoordinator;
     private @Mock Lazy<NotificationShadeWindowController> mNotificationShadeWindowControllerLazy;
+    private @Mock DreamOverlayStateController mDreamOverlayStateController;
     private DeviceConfigProxy mDeviceConfig = new DeviceConfigProxyFake();
     private FakeExecutor mUiBgExecutor = new FakeExecutor(new FakeSystemClock());
 
@@ -202,6 +204,7 @@ public class KeyguardViewMediatorTest extends SysuiTestCase {
                 () -> mNotificationShadeDepthController,
                 mScreenOnCoordinator,
                 mInteractionJankMonitor,
+                mDreamOverlayStateController,
                 mNotificationShadeWindowControllerLazy);
         mViewMediator.start();
     }
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManagerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManagerTest.java
index 5d80bca03e03..bb79941b0e53 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManagerTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManagerTest.java
@@ -43,6 +43,7 @@ import com.android.keyguard.KeyguardUpdateMonitor;
 import com.android.keyguard.ViewMediatorCallback;
 import com.android.systemui.SysuiTestCase;
 import com.android.systemui.dock.DockManager;
+import com.android.systemui.dreams.DreamOverlayStateController;
 import com.android.systemui.navigationbar.NavigationModeController;
 import com.android.systemui.plugins.ActivityStarter.OnDismissAction;
 import com.android.systemui.statusbar.NotificationMediaManager;
@@ -97,6 +98,8 @@ public class StatusBarKeyguardViewManagerTest extends SysuiTestCase {
     private KeyguardMessageArea mKeyguardMessageArea;
     @Mock
     private ShadeController mShadeController;
+    @Mock
+    private DreamOverlayStateController mDreamOverlayStateController;
 
     private StatusBarKeyguardViewManager mStatusBarKeyguardViewManager;
 
@@ -116,6 +119,7 @@ public class StatusBarKeyguardViewManagerTest extends SysuiTestCase {
                 mStatusBarStateController,
                 mock(ConfigurationController.class),
                 mKeyguardUpdateMonitor,
+                mDreamOverlayStateController,
                 mock(NavigationModeController.class),
                 mock(DockManager.class),
                 mock(NotificationShadeWindowController.class),
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java
index b7c00fe5e3a1..1564dfe8cd06 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java
@@ -87,6 +87,7 @@ import com.android.systemui.classifier.FalsingCollectorFake;
 import com.android.systemui.classifier.FalsingManagerFake;
 import com.android.systemui.colorextraction.SysuiColorExtractor;
 import com.android.systemui.demomode.DemoModeController;
+import com.android.systemui.dreams.DreamOverlayStateController;
 import com.android.systemui.dump.DumpManager;
 import com.android.systemui.flags.FeatureFlags;
 import com.android.systemui.fragments.FragmentService;
@@ -285,6 +286,7 @@ public class StatusBarTest extends SysuiTestCase {
     @Mock private NotifLiveDataStore mNotifLiveDataStore;
     @Mock private InteractionJankMonitor mJankMonitor;
     @Mock private DeviceStateManager mDeviceStateManager;
+    @Mock private DreamOverlayStateController mDreamOverlayStateController;
     private ShadeController mShadeController;
     private final FakeSystemClock mFakeSystemClock = new FakeSystemClock();
     private FakeExecutor mMainExecutor = new FakeExecutor(mFakeSystemClock);
@@ -474,7 +476,8 @@ public class StatusBarTest extends SysuiTestCase {
                 mActivityLaunchAnimator,
                 mNotifPipelineFlags,
                 mJankMonitor,
-                mDeviceStateManager);
+                mDeviceStateManager,
+                mDreamOverlayStateController);
         when(mKeyguardViewMediator.registerStatusBar(
                 any(StatusBar.class),
                 any(NotificationPanelViewController.class),