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

Commit 7060dee4 authored by Ats Jenk's avatar Ats Jenk Committed by Android (Google) Code Review
Browse files

Merge "Move classes from base package to feature packages" into main

parents 78edfbc8 90665786

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/activityembedding/ActivityEmbeddingAnimationRunnerTests.java

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ import android.window.TransitionInfo; 
import androidx.test.ext.junit.runners.AndroidJUnit4;

import androidx.test.filters.SmallTest;



import com.android.wm.shell.TransitionInfoBuilder;

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



import org.junit.Before;

import org.junit.Test;

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/activityembedding/ActivityEmbeddingControllerTests.java

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ import androidx.test.annotation.UiThreadTest; 
import androidx.test.ext.junit.runners.AndroidJUnit4;

import androidx.test.filters.SmallTest;



import com.android.wm.shell.TransitionInfoBuilder;

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



import org.junit.Before;

import org.junit.Test;

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/BubbleOverflowTest.java→libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/bubbles/BubbleOverflowTest.java

+2 −5
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.wm.shell;

package com.android.wm.shell.bubbles;



import static com.google.common.truth.Truth.assertThat;
@@ -27,10 +27,7 @@ import android.view.WindowManager; 


import androidx.test.filters.SmallTest;



import com.android.wm.shell.bubbles.BubbleController;

import com.android.wm.shell.bubbles.BubbleOverflow;

import com.android.wm.shell.bubbles.BubbleStackView;

import com.android.wm.shell.bubbles.TestableBubblePositioner;

import com.android.wm.shell.ShellTestCase;



import org.junit.Before;

import org.junit.Test;

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/bubbles/BubblesTransitionObserverTest.java

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ import android.window.WindowContainerToken; 


import androidx.test.filters.SmallTest;



import com.android.wm.shell.TransitionInfoBuilder;

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



import org.junit.Before;

import org.junit.Test;

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopTasksControllerTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ import com.android.wm.shell.MockToken 
import com.android.wm.shell.RootTaskDisplayAreaOrganizer

import com.android.wm.shell.ShellTaskOrganizer

import com.android.wm.shell.ShellTestCase

import com.android.wm.shell.TestRemoteTransition

import com.android.wm.shell.transition.TestRemoteTransition

import com.android.wm.shell.TestRunningTaskInfoBuilder

import com.android.wm.shell.TestShellExecutor

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