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

Commit 3ee49bf2 authored by Matthew Reynolds's avatar Matthew Reynolds
Browse files

Change android.test.UiThreadTest to androidx.test.annotation.UiThreadTest 

Bug: 369878945
Test: tested manually with atest
Flag: TEST_ONLY
Change-Id: I5fd1370ddab5a6083a07b04058e5a0968639f2d4
parent ac305cc8

packages/SystemUI/Android.bp

+0 −2
Original line number Diff line number Diff line
@@ -87,7 +87,6 @@ filegroup { 
    srcs: [

        "tests/src/**/systemui/broadcast/BroadcastDispatcherTest.kt",

        "tests/src/**/systemui/broadcast/ActionReceiverTest.kt",

        "tests/src/**/systemui/doze/DozeMachineTest.java",

        "tests/src/**/systemui/globalactions/GlobalActionsDialogLiteTest.java",

        "tests/src/**/systemui/globalactions/GlobalActionsImeTest.java",

        "tests/src/**/systemui/keyguard/data/repository/KeyguardTransitionRepositoryTest.kt",
@@ -175,7 +174,6 @@ filegroup { 
        "tests/src/**/systemui/controls/management/ControlsEditingActivityTest.kt",

        "tests/src/**/systemui/controls/management/ControlsRequestDialogTest.kt",

        "tests/src/**/systemui/controls/ui/DetailDialogTest.kt",

        "tests/src/**/systemui/doze/DozeMachineTest.kt",

        "tests/src/**/systemui/fontscaling/FontScalingDialogDelegateTest.kt",

        "tests/src/**/systemui/keyguard/CustomizationProviderTest.kt",

        "tests/src/**/systemui/globalactions/GlobalActionsColumnLayoutTest.java",

packages/SystemUI/multivalentTests/src/com/android/systemui/doze/DozeSuppressorTest.java

+1 −1
Original line number Diff line number Diff line
@@ -38,9 +38,9 @@ import static org.mockito.Mockito.when; 


import android.app.ActivityManager;

import android.hardware.display.AmbientDisplayConfiguration;

import android.testing.UiThreadTest;



import androidx.test.ext.junit.runners.AndroidJUnit4;

import androidx.test.annotation.UiThreadTest;

import androidx.test.filters.SmallTest;



import com.android.systemui.SysuiTestCase;

packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tileimpl/QSIconViewImplTest.java

+1 −1
Original line number Diff line number Diff line
@@ -34,9 +34,9 @@ import android.graphics.drawable.Drawable; 
import android.platform.test.annotations.DisableFlags;

import android.platform.test.annotations.EnableFlags;

import android.service.quicksettings.Tile;

import android.testing.UiThreadTest;

import android.widget.ImageView;



import androidx.test.annotation.UiThreadTest;

import androidx.test.ext.junit.runners.AndroidJUnit4;

import androidx.test.filters.SmallTest;

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/row/FeedbackInfoTest.java

+1 −1
Original line number Diff line number Diff line
@@ -45,12 +45,12 @@ import android.content.res.Configuration; 
import android.graphics.drawable.Drawable;

import android.os.UserHandle;

import android.service.notification.StatusBarNotification;

import android.testing.UiThreadTest;

import android.view.LayoutInflater;

import android.view.View;

import android.widget.ImageView;

import android.widget.TextView;



import androidx.test.annotation.UiThreadTest;

import androidx.test.ext.junit.runners.AndroidJUnit4;

import androidx.test.filters.SmallTest;

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/row/NotificationSnoozeTest.java

+1 −1
Original line number Diff line number Diff line
@@ -24,9 +24,9 @@ import static org.mockito.Mockito.mock; 


import android.provider.Settings;

import android.testing.TestableResources;

import android.testing.UiThreadTest;

import android.util.KeyValueListParser;



import androidx.test.annotation.UiThreadTest;

import androidx.test.ext.junit.runners.AndroidJUnit4;

import androidx.test.filters.SmallTest;