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

Commit 1f7d5226 authored by Fangqiu Su's avatar Fangqiu Su Committed by Android (Google) Code Review
Browse files

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

parents d8afa0d3 afce60ee

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/pip/PipTaskOrganizerTest.java

+2 −1
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ import android.content.ComponentName; 
import android.content.pm.ActivityInfo;

import android.graphics.Rect;

import android.os.RemoteException;

import android.test.suitebuilder.annotation.SmallTest;

import android.testing.AndroidTestingRunner;

import android.testing.TestableLooper;

import android.util.Rational;
@@ -45,6 +44,8 @@ import android.view.DisplayInfo; 
import android.view.SurfaceControl;

import android.window.WindowContainerToken;



import androidx.test.filters.SmallTest;



import com.android.wm.shell.MockSurfaceControlHelper;

import com.android.wm.shell.ShellTaskOrganizer;

import com.android.wm.shell.ShellTestCase;

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/pip/phone/PipControllerTest.java

+2 −1
Original line number Diff line number Diff line
@@ -42,10 +42,11 @@ import android.graphics.Point; 
import android.graphics.Rect;

import android.os.Bundle;

import android.os.RemoteException;

import android.test.suitebuilder.annotation.SmallTest;

import android.testing.AndroidTestingRunner;

import android.testing.TestableLooper;



import androidx.test.filters.SmallTest;



import com.android.wm.shell.ShellTestCase;

import com.android.wm.shell.WindowManagerShellWrapper;

import com.android.wm.shell.common.DisplayController;

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/pip/tv/TvPipActionProviderTest.java

+4 −3
Original line number Diff line number Diff line
@@ -23,20 +23,21 @@ import static com.android.wm.shell.pip.tv.TvPipAction.ACTION_EXPAND_COLLAPSE; 
import static com.android.wm.shell.pip.tv.TvPipAction.ACTION_FULLSCREEN;

import static com.android.wm.shell.pip.tv.TvPipAction.ACTION_MOVE;



import static java.util.Collections.EMPTY_LIST;



import static org.junit.Assert.assertEquals;

import static org.mockito.ArgumentMatchers.anyInt;

import static org.mockito.Mockito.times;

import static org.mockito.Mockito.verify;



import static java.util.Collections.EMPTY_LIST;



import android.app.PendingIntent;

import android.app.RemoteAction;

import android.graphics.drawable.Icon;

import android.test.suitebuilder.annotation.SmallTest;

import android.testing.AndroidTestingRunner;

import android.testing.TestableLooper;



import androidx.test.filters.SmallTest;



import com.android.wm.shell.ShellTestCase;

import com.android.wm.shell.common.pip.PipMediaController;

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/taskview/TaskViewTransitionsTest.java

+2 −1
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ import static org.mockito.Mockito.when; 
import android.app.ActivityManager;

import android.graphics.Rect;

import android.os.IBinder;

import android.test.suitebuilder.annotation.SmallTest;

import android.testing.AndroidTestingRunner;

import android.testing.TestableLooper;

import android.view.SurfaceControl;
@@ -40,6 +39,8 @@ import android.window.TransitionInfo; 
import android.window.WindowContainerToken;

import android.window.WindowContainerTransaction;



import androidx.test.filters.SmallTest;



import com.android.wm.shell.ShellTestCase;

import com.android.wm.shell.transition.Transitions;