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

Commit cd4c5b94 authored by Colin Cross's avatar Colin Cross Committed by Automerger Merge Worker
Browse files

Merge "Fixes @Nullable issues SystemUI-tests" into udc-qpr-dev am: a12441e8 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24409471



Change-Id: Ic8174fd2996d54257c706c6eac99d980de78e0af
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a3a05764 a12441e8

packages/SystemUI/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -410,6 +410,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
@@ -543,7 +543,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/KeyguardPatternViewControllerTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ class KeyguardPatternViewControllerTest : SysuiTestCase() { 
    private fun getPatternTopGuideline(): Float {

        val cs = ConstraintSet()

        val container =

            mKeyguardPatternView.findViewById(R.id.pattern_container) as ConstraintLayout

            mKeyguardPatternView.requireViewById(R.id.pattern_container) as ConstraintLayout

        cs.clone(container)

        return cs.getConstraint(R.id.pattern_top_guideline).layout.guidePercent

    }

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

+2 −2
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ class KeyguardPinViewControllerTest : SysuiTestCase() { 


        objectKeyguardPINView =

            View.inflate(mContext, R.layout.keyguard_pin_view, null)

                .findViewById(R.id.keyguard_pin_view) as KeyguardPINView

                .requireViewById(R.id.keyguard_pin_view) as KeyguardPINView

    }



    private fun constructPinViewController(
@@ -175,7 +175,7 @@ class KeyguardPinViewControllerTest : SysuiTestCase() { 


    private fun getPinTopGuideline(): Float {

        val cs = ConstraintSet()

        val container = objectKeyguardPINView.findViewById(R.id.pin_container) as ConstraintLayout

        val container = objectKeyguardPINView.requireViewById(R.id.pin_container) as ConstraintLayout

        cs.clone(container)

        return cs.getConstraint(R.id.pin_pad_top_guideline).layout.guidePercent

    }

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 }