diff options
| author | 2024-12-03 01:42:03 +0000 | |
|---|---|---|
| committer | 2024-12-03 01:42:03 +0000 | |
| commit | 3aa28ba0da7765f23006d6b0ebc460362fa2f75f (patch) | |
| tree | 571d385cd1c37c58b10c7315fedeba46a16952af | |
| parent | 1bfcb4a12515770bcecf672eb19607686dce2b26 (diff) | |
| parent | 332cb16752fbe3fa20458a101673d261b0dee722 (diff) | |
Merge "Adopt end animation callback adjustment for QSIconViewImplTest" into main
| -rw-r--r-- | packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tileimpl/QSIconViewImplTest_311121830.kt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tileimpl/QSIconViewImplTest_311121830.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tileimpl/QSIconViewImplTest_311121830.kt index ee2a1d56937b..411960f5be71 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tileimpl/QSIconViewImplTest_311121830.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tileimpl/QSIconViewImplTest_311121830.kt @@ -16,7 +16,6 @@ package com.android.systemui.qs.tileimpl -import android.animation.AnimatorTestRule import android.content.Context import android.service.quicksettings.Tile import android.view.ContextThemeWrapper @@ -26,6 +25,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.annotation.UiThreadTest import androidx.test.filters.SmallTest import com.android.systemui.SysuiTestCase +import com.android.systemui.animation.AnimatorTestRule import com.android.systemui.plugins.qs.QSTile import com.android.systemui.res.R import com.android.systemui.statusbar.connectivity.WifiIcons @@ -77,7 +77,7 @@ class QSIconViewImplTest_311121830 : SysuiTestCase() { // Set the second state to animate (it shouldn't, because `State.state` is the same) and // advance time to 2 animations length iconView.setIcon(secondState, /* allowAnimations= */ true) - animatorRule.advanceTimeBy(QSIconViewImpl.QS_ANIM_LENGTH * 2) + animatorRule.advanceAnimationDuration(QSIconViewImpl.QS_ANIM_LENGTH * 2) assertThat(iconView.mLastIcon).isEqualTo(secondState.icon) } @@ -126,7 +126,7 @@ class QSIconViewImplTest_311121830 : SysuiTestCase() { // Set the third state to animate and advance time by two times the animation length // to guarantee that all animations are done iconView.setIcon(thirdState, /* allowAnimations= */ true) - animatorRule.advanceTimeBy(QSIconViewImpl.QS_ANIM_LENGTH * 2) + animatorRule.advanceAnimationDuration(QSIconViewImpl.QS_ANIM_LENGTH * 2) assertThat(iconView.mLastIcon).isEqualTo(thirdState.icon) } |