diff options
13 files changed, 77 insertions, 48 deletions
diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/phone/ActivityStarterImplTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/phone/ActivityStarterImplTest.kt index c01f1c71fdd3..8aa0e3fc4d23 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/phone/ActivityStarterImplTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/phone/ActivityStarterImplTest.kt @@ -35,10 +35,10 @@ import com.android.systemui.keyguard.WakefulnessLifecycle import com.android.systemui.plugins.ActivityStarter.OnDismissAction import com.android.systemui.settings.UserTracker import com.android.systemui.shade.ShadeController -import com.android.systemui.shade.ShadeViewController import com.android.systemui.shade.data.repository.FakeShadeRepository import com.android.systemui.shade.data.repository.ShadeAnimationRepository import com.android.systemui.shade.domain.interactor.ShadeAnimationInteractorLegacyImpl +import com.android.systemui.statusbar.CommandQueue import com.android.systemui.statusbar.NotificationLockscreenUserManager import com.android.systemui.statusbar.NotificationShadeWindowController import com.android.systemui.statusbar.SysuiStatusBarStateController @@ -76,7 +76,7 @@ class ActivityStarterImplTest : SysuiTestCase() { @Mock private lateinit var biometricUnlockController: BiometricUnlockController @Mock private lateinit var keyguardViewMediator: KeyguardViewMediator @Mock private lateinit var shadeController: ShadeController - @Mock private lateinit var shadeViewController: ShadeViewController + @Mock private lateinit var commandQueue: CommandQueue @Mock private lateinit var statusBarKeyguardViewManager: StatusBarKeyguardViewManager @Mock private lateinit var mActivityTransitionAnimator: ActivityTransitionAnimator @Mock private lateinit var lockScreenUserManager: NotificationLockscreenUserManager @@ -105,7 +105,7 @@ class ActivityStarterImplTest : SysuiTestCase() { Lazy { biometricUnlockController }, Lazy { keyguardViewMediator }, Lazy { shadeController }, - Lazy { shadeViewController }, + commandQueue, shadeAnimationInteractor, Lazy { statusBarKeyguardViewManager }, Lazy { notifShadeWindowController }, diff --git a/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java b/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java index 7b330b0f3803..33fe0e18da6b 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java +++ b/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java @@ -111,8 +111,6 @@ import com.android.keyguard.dagger.KeyguardUserSwitcherComponent; import com.android.systemui.DejankUtils; import com.android.systemui.Dumpable; import com.android.systemui.Gefingerpoken; -import com.android.systemui.animation.ActivityTransitionAnimator; -import com.android.systemui.animation.TransitionAnimator; import com.android.systemui.biometrics.AuthController; import com.android.systemui.bouncer.domain.interactor.AlternateBouncerInteractor; import com.android.systemui.bouncer.shared.constants.KeyguardBouncerConstants; @@ -219,7 +217,6 @@ import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager; import com.android.systemui.statusbar.phone.StatusBarTouchableRegionManager; import com.android.systemui.statusbar.phone.TapAgainViewController; import com.android.systemui.statusbar.phone.UnlockedScreenOffAnimationController; -import com.android.systemui.statusbar.phone.fragment.CollapsedStatusBarFragment; import com.android.systemui.statusbar.policy.ConfigurationController; import com.android.systemui.statusbar.policy.HeadsUpManager; import com.android.systemui.statusbar.policy.KeyguardQsUserSwitchController; @@ -259,10 +256,6 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump private static final boolean DEBUG_DRAWABLE = false; /** The parallax amount of the quick settings translation when dragging down the panel. */ public static final float QS_PARALLAX_AMOUNT = 0.175f; - private static final long ANIMATION_DELAY_ICON_FADE_IN = - ActivityTransitionAnimator.TIMINGS.getTotalDuration() - - CollapsedStatusBarFragment.FADE_IN_DURATION - - CollapsedStatusBarFragment.FADE_IN_DELAY - 48; 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; @@ -463,7 +456,6 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump */ private float mLinearDarkAmount; private boolean mPulsing; - private boolean mHideIconsDuringLaunchAnimation = true; private int mStackScrollerMeasuringPass; /** Non-null if a heads-up notification's position is being tracked. */ @Nullable @@ -3157,10 +3149,9 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump return mUnlockedScreenOffAnimationController.isAnimationPlaying(); } - @Override public boolean shouldHideStatusBarIconsWhenExpanded() { if (isLaunchingActivity()) { - return mHideIconsDuringLaunchAnimation; + return false; } if (mHeadsUpAppearanceController != null && mHeadsUpAppearanceController.shouldBeVisible()) { @@ -3258,18 +3249,6 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump } @Override - public void applyLaunchAnimationProgress(float linearProgress) { - boolean hideIcons = TransitionAnimator.getProgress(ActivityTransitionAnimator.TIMINGS, - linearProgress, ANIMATION_DELAY_ICON_FADE_IN, 100) == 0.0f; - if (hideIcons != mHideIconsDuringLaunchAnimation) { - mHideIconsDuringLaunchAnimation = hideIcons; - if (!hideIcons) { - mCommandQueue.recomputeDisableFlags(mDisplayId, true /* animate */); - } - } - } - - @Override public void performHapticFeedback(int constant) { mVibratorHelper.performHapticFeedback(mView, constant); } @@ -3471,7 +3450,6 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump ipw.print("mInterpolatedDarkAmount="); ipw.println(mInterpolatedDarkAmount); ipw.print("mLinearDarkAmount="); ipw.println(mLinearDarkAmount); ipw.print("mPulsing="); ipw.println(mPulsing); - ipw.print("mHideIconsDuringLaunchAnimation="); ipw.println(mHideIconsDuringLaunchAnimation); ipw.print("mStackScrollerMeasuringPass="); ipw.println(mStackScrollerMeasuringPass); ipw.print("mPanelAlpha="); ipw.println(mPanelAlpha); ipw.print("mBottomAreaShadeAlpha="); ipw.println(mBottomAreaShadeAlpha); @@ -4163,7 +4141,6 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump return mShadeRepository.getLegacyIsClosing().getValue(); } - @Override public void collapseWithDuration(int animationDuration) { mFixedDuration = animationDuration; collapse(false /* delayed */, 1.0f /* speedUpFactor */); diff --git a/packages/SystemUI/src/com/android/systemui/shade/ShadeController.java b/packages/SystemUI/src/com/android/systemui/shade/ShadeController.java index ec4b23a56483..0a57b64b1ecf 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/ShadeController.java +++ b/packages/SystemUI/src/com/android/systemui/shade/ShadeController.java @@ -78,6 +78,14 @@ public interface ShadeController extends CoreStartable { */ void animateCollapseShade(int flags, boolean force, boolean delayed, float speedUpFactor); + /** + * Collapses the shade with an animation duration in milliseconds. + * + * @deprecated use animateCollapseShade with a speed up factor instead + */ + @Deprecated + void collapseWithDuration(int animationDuration); + /** Expand the shade with an animation. */ void animateExpandShade(); diff --git a/packages/SystemUI/src/com/android/systemui/shade/ShadeControllerEmptyImpl.kt b/packages/SystemUI/src/com/android/systemui/shade/ShadeControllerEmptyImpl.kt index 08a0c934702d..093690ffb881 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/ShadeControllerEmptyImpl.kt +++ b/packages/SystemUI/src/com/android/systemui/shade/ShadeControllerEmptyImpl.kt @@ -33,6 +33,7 @@ open class ShadeControllerEmptyImpl @Inject constructor() : ShadeController { delayed: Boolean, speedUpFactor: Float ) {} + override fun collapseWithDuration(animationDuration: Int) {} override fun animateExpandShade() {} override fun animateExpandQs() {} override fun postAnimateCollapseShade() {} diff --git a/packages/SystemUI/src/com/android/systemui/shade/ShadeControllerImpl.java b/packages/SystemUI/src/com/android/systemui/shade/ShadeControllerImpl.java index e6555f2e0993..d99d607879cc 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/ShadeControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/shade/ShadeControllerImpl.java @@ -147,6 +147,11 @@ public final class ShadeControllerImpl extends BaseShadeControllerImpl { } @Override + public void collapseWithDuration(int animationDuration) { + mNpvc.get().collapseWithDuration(animationDuration); + } + + @Override protected void expandToNotifications() { getNpvc().expandToNotifications(); } @@ -221,7 +226,6 @@ public final class ShadeControllerImpl extends BaseShadeControllerImpl { } } - @Override public void collapseShade(boolean animate) { if (animate) { diff --git a/packages/SystemUI/src/com/android/systemui/shade/ShadeControllerSceneImpl.kt b/packages/SystemUI/src/com/android/systemui/shade/ShadeControllerSceneImpl.kt index 6a2a6a417f5a..efd9ce0d08b2 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/ShadeControllerSceneImpl.kt +++ b/packages/SystemUI/src/com/android/systemui/shade/ShadeControllerSceneImpl.kt @@ -96,7 +96,7 @@ constructor( } override fun instantCollapseShade() { - // TODO(b/315921512) add support for instant transition + // TODO(b/325602936) add support for instant transition sceneInteractor.changeScene( getCollapseDestinationScene(), "hide shade", @@ -133,6 +133,11 @@ constructor( } } + override fun collapseWithDuration(animationDuration: Int) { + // TODO(b/300258424) inline this. The only caller uses the default duration. + animateCollapseShade() + } + private fun animateCollapseShadeInternal() { sceneInteractor.changeScene( getCollapseDestinationScene(), diff --git a/packages/SystemUI/src/com/android/systemui/shade/ShadeViewController.kt b/packages/SystemUI/src/com/android/systemui/shade/ShadeViewController.kt index 44c6a82d93ca..1f4a0f1f1b91 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/ShadeViewController.kt +++ b/packages/SystemUI/src/com/android/systemui/shade/ShadeViewController.kt @@ -58,9 +58,6 @@ interface ShadeViewController { /** Collapses the shade. */ fun collapse(animate: Boolean, delayed: Boolean, speedUpFactor: Float) - /** Collapses the shade with an animation duration in milliseconds. */ - fun collapseWithDuration(animationDuration: Int) - /** Collapses the shade instantly without animation. */ fun instantCollapse() @@ -102,9 +99,6 @@ interface ShadeViewController { /** Returns the StatusBarState. */ val barState: Int - /** Sets the amount of progress in the status bar launch animation. */ - fun applyLaunchAnimationProgress(linearProgress: Float) - /** Sets the alpha value of the shade to a value between 0 and 255. */ fun setAlpha(alpha: Int, animate: Boolean) diff --git a/packages/SystemUI/src/com/android/systemui/shade/ShadeViewControllerEmptyImpl.kt b/packages/SystemUI/src/com/android/systemui/shade/ShadeViewControllerEmptyImpl.kt index 7a181f106514..d756f026e21d 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/ShadeViewControllerEmptyImpl.kt +++ b/packages/SystemUI/src/com/android/systemui/shade/ShadeViewControllerEmptyImpl.kt @@ -37,7 +37,6 @@ class ShadeViewControllerEmptyImpl @Inject constructor() : override val isShadeFullyExpanded: Boolean = false override fun collapse(delayed: Boolean, speedUpFactor: Float) {} override fun collapse(animate: Boolean, delayed: Boolean, speedUpFactor: Float) {} - override fun collapseWithDuration(animationDuration: Int) {} override fun instantCollapse() {} override fun animateCollapseQs(fullyCollapse: Boolean) {} override fun canBeCollapsed(): Boolean = false @@ -55,7 +54,6 @@ class ShadeViewControllerEmptyImpl @Inject constructor() : override fun dozeTimeTick() {} override fun resetViews(animate: Boolean) {} override val barState: Int = 0 - override fun applyLaunchAnimationProgress(linearProgress: Float) {} override fun closeUserSwitcherIfOpen(): Boolean { return false } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ActivityStarterImpl.kt b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ActivityStarterImpl.kt index 270b94b1893e..23a080b7b931 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ActivityStarterImpl.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ActivityStarterImpl.kt @@ -45,8 +45,8 @@ import com.android.systemui.plugins.ActivityStarter.OnDismissAction import com.android.systemui.res.R import com.android.systemui.settings.UserTracker import com.android.systemui.shade.ShadeController -import com.android.systemui.shade.ShadeViewController import com.android.systemui.shade.domain.interactor.ShadeAnimationInteractor +import com.android.systemui.statusbar.CommandQueue import com.android.systemui.statusbar.NotificationLockscreenUserManager import com.android.systemui.statusbar.NotificationShadeWindowController import com.android.systemui.statusbar.SysuiStatusBarStateController @@ -71,7 +71,7 @@ constructor( private val biometricUnlockControllerLazy: Lazy<BiometricUnlockController>, private val keyguardViewMediatorLazy: Lazy<KeyguardViewMediator>, private val shadeControllerLazy: Lazy<ShadeController>, - private val shadeViewControllerLazy: Lazy<ShadeViewController>, + private val commandQueue: CommandQueue, private val shadeAnimationInteractor: ShadeAnimationInteractor, private val statusBarKeyguardViewManagerLazy: Lazy<StatusBarKeyguardViewManager>, private val notifShadeWindowControllerLazy: Lazy<NotificationShadeWindowController>, @@ -853,10 +853,11 @@ constructor( if (dismissShade) { return StatusBarTransitionAnimatorController( animationController, - shadeViewControllerLazy.get(), shadeAnimationInteractor, shadeControllerLazy.get(), notifShadeWindowControllerLazy.get(), + commandQueue, + displayId, isLaunchForActivity ) } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarNotificationActivityStarter.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarNotificationActivityStarter.java index 5610ed926f70..b5ab4e3eb462 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarNotificationActivityStarter.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarNotificationActivityStarter.java @@ -63,6 +63,7 @@ import com.android.systemui.settings.UserTracker; import com.android.systemui.shade.ShadeController; import com.android.systemui.shade.ShadeViewController; import com.android.systemui.shade.domain.interactor.ShadeAnimationInteractor; +import com.android.systemui.statusbar.CommandQueue; import com.android.systemui.statusbar.NotificationClickNotifier; import com.android.systemui.statusbar.NotificationLockscreenUserManager; import com.android.systemui.statusbar.NotificationPresenter; @@ -105,6 +106,7 @@ public class StatusBarNotificationActivityStarter implements NotificationActivit private final NotificationVisibilityProvider mVisibilityProvider; private final HeadsUpManager mHeadsUpManager; private final ActivityStarter mActivityStarter; + private final CommandQueue mCommandQueue; private final NotificationClickNotifier mClickNotifier; private final StatusBarKeyguardViewManager mStatusBarKeyguardViewManager; private final KeyguardManager mKeyguardManager; @@ -143,6 +145,7 @@ public class StatusBarNotificationActivityStarter implements NotificationActivit NotificationVisibilityProvider visibilityProvider, HeadsUpManager headsUpManager, ActivityStarter activityStarter, + CommandQueue commandQueue, NotificationClickNotifier clickNotifier, StatusBarKeyguardViewManager statusBarKeyguardViewManager, KeyguardManager keyguardManager, @@ -175,6 +178,7 @@ public class StatusBarNotificationActivityStarter implements NotificationActivit mVisibilityProvider = visibilityProvider; mHeadsUpManager = headsUpManager; mActivityStarter = activityStarter; + mCommandQueue = commandQueue; mClickNotifier = clickNotifier; mStatusBarKeyguardViewManager = statusBarKeyguardViewManager; mKeyguardManager = keyguardManager; @@ -444,10 +448,11 @@ public class StatusBarNotificationActivityStarter implements NotificationActivit ActivityTransitionAnimator.Controller animationController = new StatusBarTransitionAnimatorController( mNotificationAnimationProvider.getAnimatorController(row, null), - mShadeViewController, mShadeAnimationInteractor, mShadeController, mNotificationShadeWindowController, + mCommandQueue, + mDisplayId, isActivityIntent); mActivityTransitionAnimator.startPendingIntentWithAnimation( animationController, @@ -486,10 +491,11 @@ public class StatusBarNotificationActivityStarter implements NotificationActivit ActivityTransitionAnimator.Controller animationController = new StatusBarTransitionAnimatorController( mNotificationAnimationProvider.getAnimatorController(row), - mShadeViewController, mShadeAnimationInteractor, mShadeController, mNotificationShadeWindowController, + mCommandQueue, + mDisplayId, true /* isActivityIntent */); mActivityTransitionAnimator.startIntentWithAnimation( @@ -537,10 +543,11 @@ public class StatusBarNotificationActivityStarter implements NotificationActivit viewController == null ? null : new StatusBarTransitionAnimatorController( viewController, - mShadeViewController, mShadeAnimationInteractor, mShadeController, mNotificationShadeWindowController, + mCommandQueue, + mDisplayId, true /* isActivityIntent */); mActivityTransitionAnimator.startIntentWithAnimation( diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarTransitionAnimatorController.kt b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarTransitionAnimatorController.kt index 7e907d80d277..705a11df83fc 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarTransitionAnimatorController.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarTransitionAnimatorController.kt @@ -3,10 +3,13 @@ package com.android.systemui.statusbar.phone import android.view.View import com.android.systemui.animation.ActivityTransitionAnimator import com.android.systemui.animation.TransitionAnimator +import com.android.systemui.animation.TransitionAnimator.Companion.getProgress +import com.android.systemui.dagger.qualifiers.DisplayId import com.android.systemui.shade.ShadeController -import com.android.systemui.shade.ShadeViewController import com.android.systemui.shade.domain.interactor.ShadeAnimationInteractor +import com.android.systemui.statusbar.CommandQueue import com.android.systemui.statusbar.NotificationShadeWindowController +import com.android.systemui.statusbar.phone.fragment.CollapsedStatusBarFragment /** * A [ActivityTransitionAnimator.Controller] that takes care of collapsing the status bar at the @@ -14,12 +17,15 @@ import com.android.systemui.statusbar.NotificationShadeWindowController */ class StatusBarTransitionAnimatorController( private val delegate: ActivityTransitionAnimator.Controller, - private val shadeViewController: ShadeViewController, private val shadeAnimationInteractor: ShadeAnimationInteractor, private val shadeController: ShadeController, private val notificationShadeWindowController: NotificationShadeWindowController, + private val commandQueue: CommandQueue, + @DisplayId private val displayId: Int, private val isLaunchForActivity: Boolean = true ) : ActivityTransitionAnimator.Controller by delegate { + private var hideIconsDuringLaunchAnimation: Boolean = true + // Always sync the opening window with the shade, given that we draw a hole punch in the shade // of the same size and position as the opening app to make it visible. override val openingWindowSyncView: View? @@ -38,7 +44,7 @@ class StatusBarTransitionAnimatorController( delegate.onTransitionAnimationStart(isExpandingFullyAbove) shadeAnimationInteractor.setIsLaunchingActivity(true) if (!isExpandingFullyAbove) { - shadeViewController.collapseWithDuration( + shadeController.collapseWithDuration( ActivityTransitionAnimator.TIMINGS.totalDuration.toInt() ) } @@ -56,7 +62,19 @@ class StatusBarTransitionAnimatorController( linearProgress: Float ) { delegate.onTransitionAnimationProgress(state, progress, linearProgress) - shadeViewController.applyLaunchAnimationProgress(linearProgress) + val hideIcons = + getProgress( + ActivityTransitionAnimator.TIMINGS, + linearProgress, + ANIMATION_DELAY_ICON_FADE_IN, + 100 + ) == 0.0f + if (hideIcons != hideIconsDuringLaunchAnimation) { + hideIconsDuringLaunchAnimation = hideIcons + if (!hideIcons) { + commandQueue.recomputeDisableFlags(displayId, true /* animate */) + } + } } override fun onTransitionAnimationCancelled(newKeyguardOccludedState: Boolean?) { @@ -64,4 +82,12 @@ class StatusBarTransitionAnimatorController( shadeAnimationInteractor.setIsLaunchingActivity(false) shadeController.onLaunchAnimationCancelled(isLaunchForActivity) } + + companion object { + val ANIMATION_DELAY_ICON_FADE_IN = + (ActivityTransitionAnimator.TIMINGS.totalDuration - + CollapsedStatusBarFragment.FADE_IN_DURATION - + CollapsedStatusBarFragment.FADE_IN_DELAY - + 48) + } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarNotificationActivityStarterTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarNotificationActivityStarterTest.java index 41514ce3e72c..938b2f88d4b4 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarNotificationActivityStarterTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarNotificationActivityStarterTest.java @@ -79,6 +79,7 @@ import com.android.systemui.shade.ShadeViewController; import com.android.systemui.shade.data.repository.FakeShadeRepository; import com.android.systemui.shade.data.repository.ShadeAnimationRepository; import com.android.systemui.shade.domain.interactor.ShadeAnimationInteractorLegacyImpl; +import com.android.systemui.statusbar.CommandQueue; import com.android.systemui.statusbar.NotificationClickNotifier; import com.android.systemui.statusbar.NotificationLockscreenUserManager; import com.android.systemui.statusbar.NotificationPresenter; @@ -130,6 +131,8 @@ public class StatusBarNotificationActivityStarterTest extends SysuiTestCase { @Mock private ActivityStarter mActivityStarter; @Mock + private CommandQueue mCommandQueue; + @Mock private NotificationClickNotifier mClickNotifier; @Mock private StatusBarStateController mStatusBarStateController; @@ -236,6 +239,7 @@ public class StatusBarNotificationActivityStarterTest extends SysuiTestCase { mVisibilityProvider, headsUpManager, mActivityStarter, + mCommandQueue, mClickNotifier, mStatusBarKeyguardViewManager, mock(KeyguardManager.class), @@ -257,7 +261,9 @@ public class StatusBarNotificationActivityStarterTest extends SysuiTestCase { mock(NotificationShadeWindowController.class), mActivityTransitionAnimator, new ShadeAnimationInteractorLegacyImpl( - new ShadeAnimationRepository(), new FakeShadeRepository()), + new ShadeAnimationRepository(), + new FakeShadeRepository() + ), notificationAnimationProvider, mock(LaunchFullScreenIntentProvider.class), mPowerInteractor, diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/phone/StatusBarNotificationActivityStarterKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/phone/StatusBarNotificationActivityStarterKosmos.kt index 41c11ad61c7f..7a86c4f73a3f 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/phone/StatusBarNotificationActivityStarterKosmos.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/phone/StatusBarNotificationActivityStarterKosmos.kt @@ -33,6 +33,7 @@ import com.android.systemui.settings.userTracker import com.android.systemui.shade.domain.interactor.shadeAnimationInteractor import com.android.systemui.shade.shadeController import com.android.systemui.shade.shadeViewController +import com.android.systemui.statusbar.commandQueue import com.android.systemui.statusbar.notification.collection.provider.launchFullScreenIntentProvider import com.android.systemui.statusbar.notification.collection.render.notificationVisibilityProvider import com.android.systemui.statusbar.notification.notificationTransitionAnimatorControllerProvider @@ -59,6 +60,7 @@ val Kosmos.statusBarNotificationActivityStarter by notificationVisibilityProvider, headsUpManager, activityStarter, + commandQueue, notificationClickNotifier, statusBarKeyguardViewManager, keyguardManager, |