diff --git a/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayContainerViewController.java b/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayContainerViewController.java index af9967a18dccb..733a80dd7f69f 100644 --- a/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayContainerViewController.java +++ b/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayContainerViewController.java @@ -76,9 +76,6 @@ public class DreamOverlayContainerViewController extends ViewController lifecycleRegistryLazy) { diff --git a/packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayContainerViewControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayContainerViewControllerTest.java index 9e9c56734a4da..c5a7de410eb0f 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayContainerViewControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayContainerViewControllerTest.java @@ -19,7 +19,6 @@ package com.android.systemui.dreams; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyFloat; import static org.mockito.ArgumentMatchers.anyInt; -import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; @@ -29,7 +28,6 @@ import android.content.res.Resources; import android.os.Handler; import android.testing.AndroidTestingRunner; import android.view.ViewGroup; -import android.view.ViewPropertyAnimator; import android.view.ViewRootImpl; import android.view.ViewTreeObserver; @@ -94,9 +92,6 @@ public class DreamOverlayContainerViewControllerTest extends SysuiTestCase { @Mock BouncerCallbackInteractor mBouncerCallbackInteractor; - @Mock - ViewPropertyAnimator mViewPropertyAnimator; - DreamOverlayContainerViewController mController; @Before @@ -105,12 +100,8 @@ public class DreamOverlayContainerViewControllerTest extends SysuiTestCase { when(mDreamOverlayContainerView.getResources()).thenReturn(mResources); when(mDreamOverlayContainerView.getViewTreeObserver()).thenReturn(mViewTreeObserver); - when(mDreamOverlayContainerView.animate()).thenReturn(mViewPropertyAnimator); when(mStatusBarKeyguardViewManager.getBouncer()).thenReturn(mBouncer); when(mDreamOverlayContainerView.getViewRootImpl()).thenReturn(mViewRoot); - when(mViewPropertyAnimator.alpha(anyFloat())).thenReturn(mViewPropertyAnimator); - when(mViewPropertyAnimator.setStartDelay(anyLong())).thenReturn(mViewPropertyAnimator); - when(mViewPropertyAnimator.setDuration(anyLong())).thenReturn(mViewPropertyAnimator); mController = new DreamOverlayContainerViewController( mDreamOverlayContainerView, @@ -124,9 +115,7 @@ public class DreamOverlayContainerViewControllerTest extends SysuiTestCase { MAX_BURN_IN_OFFSET, BURN_IN_PROTECTION_UPDATE_INTERVAL, MILLIS_UNTIL_FULL_JITTER, - mBouncerCallbackInteractor, - 100 /*openAnimationDuration*/, - 100 /*openAnimationDelay*/); + mBouncerCallbackInteractor); } @Test diff --git a/packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayStatusBarViewControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayStatusBarViewControllerTest.java index 240e6b6d12796..aa021781296a2 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayStatusBarViewControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayStatusBarViewControllerTest.java @@ -20,9 +20,7 @@ import static android.app.StatusBarManager.WINDOW_STATE_HIDDEN; import static android.app.StatusBarManager.WINDOW_STATE_SHOWING; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyFloat; import static org.mockito.ArgumentMatchers.anyInt; -import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.isNull; import static org.mockito.Mockito.never; @@ -40,7 +38,6 @@ import android.net.NetworkRequest; import android.provider.Settings; import android.testing.AndroidTestingRunner; import android.view.View; -import android.view.ViewPropertyAnimator; import androidx.test.filters.SmallTest; @@ -107,8 +104,6 @@ public class DreamOverlayStatusBarViewControllerTest extends SysuiTestCase { View mStatusBarItemView; @Mock DreamOverlayStateController mDreamOverlayStateController; - @Mock - ViewPropertyAnimator mViewPropertyAnimator; private final Executor mMainExecutor = Runnable::run; @@ -120,10 +115,6 @@ public class DreamOverlayStatusBarViewControllerTest extends SysuiTestCase { when(mResources.getString(R.string.dream_overlay_status_bar_notification_indicator)) .thenReturn(NOTIFICATION_INDICATOR_FORMATTER_STRING); - when(mView.animate()).thenReturn(mViewPropertyAnimator); - when(mViewPropertyAnimator.alpha(anyFloat())).thenReturn(mViewPropertyAnimator); - when(mViewPropertyAnimator.setStartDelay(anyLong())).thenReturn(mViewPropertyAnimator); - when(mViewPropertyAnimator.setDuration(anyLong())).thenReturn(mViewPropertyAnimator); mController = new DreamOverlayStatusBarViewController( mView, @@ -139,9 +130,7 @@ public class DreamOverlayStatusBarViewControllerTest extends SysuiTestCase { mZenModeController, mStatusBarWindowStateController, mDreamOverlayStatusBarItemsProvider, - mDreamOverlayStateController, - 100 /*openAnimationDuration*/, - 100 /*openAnimationDelay*/); + mDreamOverlayStateController); } @Test @@ -283,9 +272,7 @@ public class DreamOverlayStatusBarViewControllerTest extends SysuiTestCase { mZenModeController, mStatusBarWindowStateController, mDreamOverlayStatusBarItemsProvider, - mDreamOverlayStateController, - 100 /*openAnimationDuration*/, - 100 /*openAnimationDelay*/); + mDreamOverlayStateController); controller.onViewAttached(); verify(mView, never()).showIcon( eq(DreamOverlayStatusBarView.STATUS_ICON_NOTIFICATIONS), eq(true), any());