Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2be5c8ae authored by Vinit Nayak's avatar Vinit Nayak Committed by Android (Google) Code Review
Browse files

Merge "Fix test breakages"

parents 090ed0c1 1d30f9c8

packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java

+3 −3
Original line number Diff line number Diff line
@@ -1675,8 +1675,8 @@ public final class NotificationPanelViewController { 
                transition.setDuration(StackStateAnimator.ANIMATION_DURATION_STANDARD);



                boolean customClockAnimation =

                        mKeyguardStatusViewController

                                .getClockAnimations()

                            mKeyguardStatusViewController.getClockAnimations() != null

                            && mKeyguardStatusViewController.getClockAnimations()

                                    .getHasCustomPositionUpdatedAnimation();



                if (mFeatureFlags.isEnabled(Flags.STEP_CLOCK_ANIMATION) && customClockAnimation) {

packages/SystemUI/tests/src/com/android/systemui/shared/clocks/AnimatableClockViewTest.kt

+3 −2
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import androidx.test.filters.SmallTest 
import com.android.systemui.R

import com.android.systemui.SysuiTestCase

import com.android.systemui.animation.TextAnimator

import com.android.systemui.util.mockito.any

import org.junit.Before

import org.junit.Rule

import org.junit.Test
@@ -55,7 +56,7 @@ class AnimatableClockViewTest : SysuiTestCase() { 
        clockView.animateAppearOnLockscreen()

        clockView.measure(50, 50)



        verify(mockTextAnimator).glyphFilter = null

        verify(mockTextAnimator).glyphFilter = any()

        verify(mockTextAnimator).setTextStyle(300, -1.0f, 200, false, 350L, null, 0L, null)

        verifyNoMoreInteractions(mockTextAnimator)

    }
@@ -66,7 +67,7 @@ class AnimatableClockViewTest : SysuiTestCase() { 
        clockView.measure(50, 50)

        clockView.animateAppearOnLockscreen()



        verify(mockTextAnimator, times(2)).glyphFilter = null

        verify(mockTextAnimator, times(2)).glyphFilter = any()

        verify(mockTextAnimator).setTextStyle(100, -1.0f, 200, false, 0L, null, 0L, null)

        verify(mockTextAnimator).setTextStyle(300, -1.0f, 200, true, 350L, null, 0L, null)

        verifyNoMoreInteractions(mockTextAnimator)