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

Commit 567d4c29 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Update the imports to androidx.test.filters.*" into main

parents a1120587 8168199b

packages/SystemUI/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -169,6 +169,7 @@ android_library { 
        "androidx.compose.material_material-icons-extended",

        "androidx.activity_activity-compose",

        "androidx.compose.animation_animation-graphics",

        "androidx.test.rules",

    ],

    libs: [

        "keepanno-annotations",

packages/SystemUI/tests/src/com/android/AAAPlusPlusVerifySysuiRequiredTestPropertiesTest.java

+3 −3
Original line number Diff line number Diff line
@@ -68,9 +68,9 @@ public class AAAPlusPlusVerifySysuiRequiredTestPropertiesTest extends SysuiTestC 
            SmallTest.class,

            MediumTest.class,

            LargeTest.class,

            android.test.suitebuilder.annotation.SmallTest.class,

            android.test.suitebuilder.annotation.MediumTest.class,

            android.test.suitebuilder.annotation.LargeTest.class,

            androidx.test.filters.SmallTest.class,

            androidx.test.filters.MediumTest.class,

            androidx.test.filters.LargeTest.class,

    };



    @Test

packages/SystemUI/tests/src/com/android/systemui/monet/ColorSchemeTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
 */

package com.android.systemui.monet



import android.test.suitebuilder.annotation.SmallTest

import androidx.test.filters.SmallTest

import android.testing.AndroidTestingRunner

import android.util.Log

import com.android.systemui.SysuiTestCase

packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/BatteryControllerStartableTest.java

+2 −2
Original line number Diff line number Diff line
@@ -28,10 +28,11 @@ import android.os.Looper; 
import android.os.PowerManager;

import android.platform.test.annotations.DisableFlags;

import android.platform.test.annotations.EnableFlags;

import android.test.suitebuilder.annotation.SmallTest;

import android.testing.AndroidTestingRunner;

import android.testing.TestableLooper;



import androidx.test.filters.SmallTest;



import com.android.settingslib.fuelgauge.BatterySaverUtils;

import com.android.systemui.Flags;

import com.android.systemui.SysuiTestCase;
@@ -42,7 +43,6 @@ import com.android.systemui.power.EnhancedEstimates; 
import com.android.systemui.util.concurrency.FakeExecutor;

import com.android.systemui.util.time.FakeSystemClock;





import org.junit.After;

import org.junit.Before;

import org.junit.Test;