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

Commit 37c565d9 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add new SystemUI AnimatorTestRule that wraps both platform and androidx... 

Merge "Add new SystemUI AnimatorTestRule that wraps both platform and androidx versions of the same" into udc-qpr-dev am: 9c9649e4 am: 91ff3f30

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



Change-Id: Iabb6f2fded8f7612965375d16470a16effb0de16
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d5e77bac 91ff3f30

packages/SystemUI/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -408,6 +408,7 @@ android_library { 
    static_libs: [

        "SystemUI-tests-base",

        "androidx.test.uiautomator_uiautomator",

        "androidx.core_core-animation-testing",

        "mockito-target-extended-minus-junit4",

        "androidx.test.ext.junit",

        "androidx.test.ext.truth",
@@ -477,6 +478,7 @@ android_robolectric_test { 
    ],

    static_libs: [

        "androidx.test.uiautomator_uiautomator",

        "androidx.core_core-animation-testing",

        "androidx.test.ext.junit",

        "inline-mockito-robolectric-prebuilt",

    ],

packages/SystemUI/tests/src/android/animation/AnimatorTestRuleIsolationTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ import org.junit.runner.RunWith 
 */

@RunWith(AndroidTestingRunner::class)

@SmallTest

@RunWithLooper(setAsMainLooper = true)

@RunWithLooper

class AnimatorTestRuleIsolationTest : SysuiTestCase() {



    @get:Rule val animatorTestRule = AnimatorTestRule()

packages/SystemUI/tests/src/android/animation/AnimatorTestRulePrecisionTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ import org.junit.runner.RunWith 


@RunWith(AndroidTestingRunner::class)

@SmallTest

@RunWithLooper(setAsMainLooper = true)

@RunWithLooper

class AnimatorTestRulePrecisionTest : SysuiTestCase() {



    @get:Rule val animatorTestRule = AnimatorTestRule()

packages/SystemUI/tests/src/androidx/core/animation/AnimatorTestRuleIsolationTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ import org.junit.runner.RunWith 
 */

@RunWith(AndroidTestingRunner::class)

@SmallTest

@RunWithLooper(setAsMainLooper = true)

@RunWithLooper

class AnimatorTestRuleIsolationTest : SysuiTestCase() {



    @get:Rule val animatorTestRule = AnimatorTestRule()

packages/SystemUI/tests/src/com/android/systemui/ExpandHelperTest.java

+1 −1
Original line number Diff line number Diff line
@@ -25,12 +25,12 @@ import android.testing.AndroidTestingRunner; 
import android.testing.TestableLooper;

import android.testing.TestableLooper.RunWithLooper;



import androidx.core.animation.AnimatorTestRule;

import androidx.core.animation.ObjectAnimator;

import androidx.test.annotation.UiThreadTest;

import androidx.test.filters.SmallTest;



import com.android.keyguard.KeyguardUpdateMonitor;

import com.android.systemui.animation.AnimatorTestRule;

import com.android.systemui.flags.FakeFeatureFlags;

import com.android.systemui.flags.Flags;

import com.android.systemui.statusbar.NotificationMediaManager;