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

Commit 3e166edd authored by Colin Cross's avatar Colin Cross Committed by Cherrypicker Worker
Browse files

Fixes @Nullable issues SystemUI-tests 

Test: builds
Bug: 294098415
(cherry picked from commit 852cd148)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:b9b9aa5eb66403599e5a0c9ea87d6e5dbfc2cabd)
Merged-In: I258629e15004bf5cca37e5544727c92551a10a78
Change-Id: I258629e15004bf5cca37e5544727c92551a10a78
parent 507e0b7b

packages/SystemUI/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -388,6 +388,7 @@ android_library { 
        "mockito-target-extended-minus-junit4",

        "androidx.test.ext.junit",

        "androidx.test.ext.truth",

        "kotlin-test",

    ],

    libs: [

        "android.test.runner",

packages/SystemUI/src/com/android/keyguard/KeyguardStatusViewController.java

+2 −1
Original line number Diff line number Diff line
@@ -444,7 +444,8 @@ public class KeyguardStatusViewController extends ViewController<KeyguardStatusV 


        @Nullable

        @Override

        public Animator createAnimator(ViewGroup sceneRoot, @Nullable TransitionValues startValues,

        public Animator createAnimator(@NonNull ViewGroup sceneRoot,

                @Nullable TransitionValues startValues,

                @Nullable TransitionValues endValues) {

            if (startValues == null || endValues == null) {

                return null;

packages/SystemUI/tests/src/com/android/keyguard/KeyguardStatusViewTest.kt

+2 −2
Original line number Diff line number Diff line
@@ -21,9 +21,9 @@ class KeyguardStatusViewTest : SysuiTestCase() { 


    private lateinit var keyguardStatusView: KeyguardStatusView

    private val mediaView: View

        get() = keyguardStatusView.findViewById(R.id.status_view_media_container)

        get() = keyguardStatusView.requireViewById(R.id.status_view_media_container)

    private val statusViewContainer: ViewGroup

        get() = keyguardStatusView.findViewById(R.id.status_view_container)

        get() = keyguardStatusView.requireViewById(R.id.status_view_container)

    private val childrenExcludingMedia

        get() = statusViewContainer.children.filter { it != mediaView }

packages/SystemUI/tests/src/com/android/keyguard/SplitShadeTransitionAdapterTest.kt

+3 −1
Original line number Diff line number Diff line
@@ -19,9 +19,11 @@ import android.animation.Animator 
import android.testing.AndroidTestingRunner

import android.transition.TransitionValues

import android.view.View

import android.view.ViewGroup

import androidx.test.filters.SmallTest

import com.android.keyguard.KeyguardStatusViewController.SplitShadeTransitionAdapter

import com.android.systemui.SysuiTestCase

import com.android.systemui.util.mockito.mock

import com.google.common.truth.Truth.assertThat

import org.junit.Before

import org.junit.Test
@@ -84,5 +86,5 @@ private fun SplitShadeTransitionAdapter.createAnimator( 
    startValues: TransitionValues?,

    endValues: TransitionValues?

): Animator? {

    return createAnimator(/* sceneRoot= */ null, startValues, endValues)

    return createAnimator(/* sceneRoot= */ mock(), startValues, endValues)

}

packages/SystemUI/tests/src/com/android/keyguard/clock/ViewPreviewerTest.kt

+2 −2
Original line number Diff line number Diff line
@@ -55,9 +55,9 @@ class ViewPreviewerTest : SysuiTestCase() { 
    }



    class TestView(context: Context) : View(context) {

        override fun onDraw(canvas: Canvas?) {

        override fun onDraw(canvas: Canvas) {

            super.onDraw(canvas)

            canvas?.drawColor(Color.RED)

            canvas.drawColor(Color.RED)

        }

    }

}