diff options
31 files changed, 57 insertions, 57 deletions
diff --git a/core/java/android/app/ActivityManager.java b/core/java/android/app/ActivityManager.java index 1b8170474484..556f84109ce6 100644 --- a/core/java/android/app/ActivityManager.java +++ b/core/java/android/app/ActivityManager.java @@ -73,7 +73,7 @@ import android.util.ArrayMap; import android.util.DisplayMetrics; import android.util.Singleton; import android.util.Size; -import android.view.IWindowContainer; +import android.window.IWindowContainer; import android.view.Surface; import com.android.internal.app.LocalePicker; diff --git a/core/java/android/app/ActivityTaskManager.java b/core/java/android/app/ActivityTaskManager.java index fb315add36d2..c9673f59183a 100644 --- a/core/java/android/app/ActivityTaskManager.java +++ b/core/java/android/app/ActivityTaskManager.java @@ -30,6 +30,7 @@ import android.os.IBinder; import android.os.RemoteException; import android.os.ServiceManager; import android.util.Singleton; +import android.window.ITaskOrganizerController; import java.util.List; diff --git a/core/java/android/app/IActivityTaskManager.aidl b/core/java/android/app/IActivityTaskManager.aidl index 7c8926341555..ab5c6788969a 100644 --- a/core/java/android/app/IActivityTaskManager.aidl +++ b/core/java/android/app/IActivityTaskManager.aidl @@ -29,7 +29,7 @@ import android.app.IProcessObserver; import android.app.IRequestFinishCallback; import android.app.IServiceConnection; import android.app.IStopUserCallback; -import android.app.ITaskOrganizerController; +import android.window.ITaskOrganizerController; import android.app.ITaskStackListener; import android.app.IUiAutomationConnection; import android.app.IUidObserver; @@ -69,7 +69,7 @@ import android.os.StrictMode; import android.os.WorkSource; import android.service.voice.IVoiceInteractionSession; import android.view.IRecentsAnimationRunner; -import android.view.ITaskOrganizer; +import android.window.ITaskOrganizer; import android.view.RemoteAnimationDefinition; import android.view.RemoteAnimationAdapter; import com.android.internal.app.IVoiceInteractor; diff --git a/core/java/android/app/TaskInfo.java b/core/java/android/app/TaskInfo.java index b2dd0ef012d8..7c0fc4265cf5 100644 --- a/core/java/android/app/TaskInfo.java +++ b/core/java/android/app/TaskInfo.java @@ -28,7 +28,7 @@ import android.content.res.Configuration; import android.os.Parcel; import android.os.RemoteException; import android.util.Log; -import android.view.IWindowContainer; +import android.window.IWindowContainer; /** * Stores information about a particular Task. diff --git a/core/java/android/view/IDisplayWindowRotationCallback.aidl b/core/java/android/view/IDisplayWindowRotationCallback.aidl index 79a15ad746b3..1ffe2dde40f1 100644 --- a/core/java/android/view/IDisplayWindowRotationCallback.aidl +++ b/core/java/android/view/IDisplayWindowRotationCallback.aidl @@ -16,7 +16,7 @@ package android.view; -import android.view.WindowContainerTransaction; +import android.window.WindowContainerTransaction; /** * Interface to be invoked by the controller when it has finished preparing for a display rotation. diff --git a/core/java/android/view/ITaskOrganizer.aidl b/core/java/android/window/ITaskOrganizer.aidl index 565f694b8a55..b2da23949005 100644 --- a/core/java/android/view/ITaskOrganizer.aidl +++ b/core/java/android/window/ITaskOrganizer.aidl @@ -15,11 +15,11 @@ ** limitations under the License. */ -package android.view; +package android.window; -import android.view.IWindowContainer; import android.view.SurfaceControl; import android.app.ActivityManager; +import android.window.IWindowContainer; /** * Interface for ActivityTaskManager/WindowManager to delegate control of tasks. @@ -49,4 +49,4 @@ oneway interface ITaskOrganizer { * has adopted an ActivityType of HOME and proceeds to show the minimized dock UX. */ void onTaskInfoChanged(in ActivityManager.RunningTaskInfo info); -}
\ No newline at end of file +} diff --git a/core/java/android/app/ITaskOrganizerController.aidl b/core/java/android/window/ITaskOrganizerController.aidl index a448e132bcc9..e8af8e196bed 100644 --- a/core/java/android/app/ITaskOrganizerController.aidl +++ b/core/java/android/window/ITaskOrganizerController.aidl @@ -14,12 +14,12 @@ * limitations under the License. */ -package android.app; +package android.window; import android.app.ActivityManager; -import android.view.ITaskOrganizer; -import android.view.IWindowContainer; -import android.view.WindowContainerTransaction; +import android.window.ITaskOrganizer; +import android.window.IWindowContainer; +import android.window.WindowContainerTransaction; /** @hide */ interface ITaskOrganizerController { diff --git a/core/java/android/view/IWindowContainer.aidl b/core/java/android/window/IWindowContainer.aidl index 878d86bcae9a..f2960f640f6d 100644 --- a/core/java/android/view/IWindowContainer.aidl +++ b/core/java/android/window/IWindowContainer.aidl @@ -14,7 +14,7 @@ * limitations under the License. */ -package android.view; +package android.window; import android.view.SurfaceControl; diff --git a/core/java/android/window/OWNERS b/core/java/android/window/OWNERS new file mode 100644 index 000000000000..d10fb31e104f --- /dev/null +++ b/core/java/android/window/OWNERS @@ -0,0 +1,3 @@ +set noparent + +include ../../../../services/core/java/com/android/server/wm/OWNERS diff --git a/core/java/android/view/WindowContainerTransaction.aidl b/core/java/android/window/WindowContainerTransaction.aidl index 46ba6c1d5c59..da77a005eb15 100644 --- a/core/java/android/view/WindowContainerTransaction.aidl +++ b/core/java/android/window/WindowContainerTransaction.aidl @@ -14,6 +14,6 @@ * limitations under the License. */ -package android.view; +package android.window; parcelable WindowContainerTransaction; diff --git a/core/java/android/view/WindowContainerTransaction.java b/core/java/android/window/WindowContainerTransaction.java index 56b49515f419..483dec66cfd3 100644 --- a/core/java/android/view/WindowContainerTransaction.java +++ b/core/java/android/window/WindowContainerTransaction.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019 The Android Open Source Project + * Copyright (C) 2020 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package android.view; +package android.window; import android.annotation.NonNull; import android.annotation.Nullable; @@ -26,6 +26,7 @@ import android.os.IBinder; import android.os.Parcel; import android.os.Parcelable; import android.util.ArrayMap; +import android.window.IWindowContainer; import android.view.SurfaceControl; import java.util.ArrayList; diff --git a/packages/SystemUI/src/com/android/systemui/pip/PipBoundsHandler.java b/packages/SystemUI/src/com/android/systemui/pip/PipBoundsHandler.java index 8be2502f98eb..4969fc81978e 100644 --- a/packages/SystemUI/src/com/android/systemui/pip/PipBoundsHandler.java +++ b/packages/SystemUI/src/com/android/systemui/pip/PipBoundsHandler.java @@ -37,8 +37,8 @@ import android.util.TypedValue; import android.view.DisplayInfo; import android.view.Gravity; import android.view.IWindowManager; -import android.view.WindowContainerTransaction; import android.view.WindowManagerGlobal; +import android.window.WindowContainerTransaction; import java.io.PrintWriter; diff --git a/packages/SystemUI/src/com/android/systemui/pip/PipTaskOrganizer.java b/packages/SystemUI/src/com/android/systemui/pip/PipTaskOrganizer.java index dc1b5d70089b..195050e41278 100644 --- a/packages/SystemUI/src/com/android/systemui/pip/PipTaskOrganizer.java +++ b/packages/SystemUI/src/com/android/systemui/pip/PipTaskOrganizer.java @@ -27,7 +27,7 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.app.ActivityManager; import android.app.ActivityTaskManager; -import android.app.ITaskOrganizerController; +import android.window.ITaskOrganizerController; import android.app.PictureInPictureParams; import android.content.Context; import android.content.pm.ActivityInfo; @@ -38,10 +38,10 @@ import android.os.Looper; import android.os.RemoteException; import android.util.Log; import android.util.Size; -import android.view.ITaskOrganizer; -import android.view.IWindowContainer; +import android.window.ITaskOrganizer; +import android.window.IWindowContainer; import android.view.SurfaceControl; -import android.view.WindowContainerTransaction; +import android.window.WindowContainerTransaction; import com.android.internal.os.SomeArgs; import com.android.systemui.R; diff --git a/packages/SystemUI/src/com/android/systemui/pip/phone/PipManager.java b/packages/SystemUI/src/com/android/systemui/pip/phone/PipManager.java index fe0940c22c43..a0dff3f98173 100644 --- a/packages/SystemUI/src/com/android/systemui/pip/phone/PipManager.java +++ b/packages/SystemUI/src/com/android/systemui/pip/phone/PipManager.java @@ -34,7 +34,7 @@ import android.util.Log; import android.util.Pair; import android.view.DisplayInfo; import android.view.IPinnedStackController; -import android.view.WindowContainerTransaction; +import android.window.WindowContainerTransaction; import com.android.systemui.Dependency; import com.android.systemui.UiOffloadThread; diff --git a/packages/SystemUI/src/com/android/systemui/stackdivider/Divider.java b/packages/SystemUI/src/com/android/systemui/stackdivider/Divider.java index d58cc730e749..3d5281247f63 100644 --- a/packages/SystemUI/src/com/android/systemui/stackdivider/Divider.java +++ b/packages/SystemUI/src/com/android/systemui/stackdivider/Divider.java @@ -32,12 +32,12 @@ import android.os.Handler; import android.os.RemoteException; import android.provider.Settings; import android.util.Slog; -import android.view.IWindowContainer; +import android.window.IWindowContainer; import android.view.LayoutInflater; import android.view.SurfaceControl; import android.view.SurfaceSession; import android.view.View; -import android.view.WindowContainerTransaction; +import android.window.WindowContainerTransaction; import androidx.annotation.Nullable; diff --git a/packages/SystemUI/src/com/android/systemui/stackdivider/SplitDisplayLayout.java b/packages/SystemUI/src/com/android/systemui/stackdivider/SplitDisplayLayout.java index deead34b86bf..3b8addb85d85 100644 --- a/packages/SystemUI/src/com/android/systemui/stackdivider/SplitDisplayLayout.java +++ b/packages/SystemUI/src/com/android/systemui/stackdivider/SplitDisplayLayout.java @@ -32,7 +32,7 @@ import android.content.res.Configuration; import android.content.res.Resources; import android.graphics.Rect; import android.util.TypedValue; -import android.view.WindowContainerTransaction; +import android.window.WindowContainerTransaction; import com.android.internal.policy.DividerSnapAlgorithm; import com.android.internal.policy.DockedDividerUtils; diff --git a/packages/SystemUI/src/com/android/systemui/stackdivider/SplitScreenTaskOrganizer.java b/packages/SystemUI/src/com/android/systemui/stackdivider/SplitScreenTaskOrganizer.java index f1bb27af776b..f82936a4492b 100644 --- a/packages/SystemUI/src/com/android/systemui/stackdivider/SplitScreenTaskOrganizer.java +++ b/packages/SystemUI/src/com/android/systemui/stackdivider/SplitScreenTaskOrganizer.java @@ -24,12 +24,12 @@ import static android.app.WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_SECOND import static android.view.Display.DEFAULT_DISPLAY; import android.app.ActivityManager.RunningTaskInfo; -import android.app.ITaskOrganizerController; +import android.window.ITaskOrganizerController; import android.app.WindowConfiguration; import android.os.RemoteException; import android.util.Log; import android.view.Display; -import android.view.ITaskOrganizer; +import android.window.ITaskOrganizer; import android.view.SurfaceControl; import android.view.SurfaceSession; diff --git a/packages/SystemUI/src/com/android/systemui/stackdivider/WindowManagerProxy.java b/packages/SystemUI/src/com/android/systemui/stackdivider/WindowManagerProxy.java index fea57a320d04..0e391ec7580a 100644 --- a/packages/SystemUI/src/com/android/systemui/stackdivider/WindowManagerProxy.java +++ b/packages/SystemUI/src/com/android/systemui/stackdivider/WindowManagerProxy.java @@ -28,8 +28,8 @@ import android.graphics.Rect; import android.os.RemoteException; import android.util.Log; import android.view.Display; -import android.view.IWindowContainer; -import android.view.WindowContainerTransaction; +import android.window.IWindowContainer; +import android.window.WindowContainerTransaction; import android.view.WindowManagerGlobal; import com.android.internal.annotations.GuardedBy; diff --git a/packages/SystemUI/src/com/android/systemui/wm/DisplayChangeController.java b/packages/SystemUI/src/com/android/systemui/wm/DisplayChangeController.java index 66bc306d4a59..6eba9acbab4e 100644 --- a/packages/SystemUI/src/com/android/systemui/wm/DisplayChangeController.java +++ b/packages/SystemUI/src/com/android/systemui/wm/DisplayChangeController.java @@ -21,7 +21,7 @@ import android.os.RemoteException; import android.view.IDisplayWindowRotationCallback; import android.view.IDisplayWindowRotationController; import android.view.IWindowManager; -import android.view.WindowContainerTransaction; +import android.window.WindowContainerTransaction; import java.util.ArrayList; diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java index 890b9454e6b6..184439587a02 100644 --- a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java +++ b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java @@ -144,7 +144,7 @@ import android.app.IApplicationThread; import android.app.IAssistDataReceiver; import android.app.INotificationManager; import android.app.IRequestFinishCallback; -import android.app.ITaskOrganizerController; +import android.window.ITaskOrganizerController; import android.app.ITaskStackListener; import android.app.Notification; import android.app.NotificationManager; @@ -230,7 +230,7 @@ import android.util.proto.ProtoOutputStream; import android.view.IRecentsAnimationRunner; import android.view.RemoteAnimationAdapter; import android.view.RemoteAnimationDefinition; -import android.view.WindowContainerTransaction; +import android.window.WindowContainerTransaction; import android.view.WindowManager; import com.android.internal.R; diff --git a/services/core/java/com/android/server/wm/BLASTSyncEngine.java b/services/core/java/com/android/server/wm/BLASTSyncEngine.java index c18ed7d588d8..5b20023b3fb0 100644 --- a/services/core/java/com/android/server/wm/BLASTSyncEngine.java +++ b/services/core/java/com/android/server/wm/BLASTSyncEngine.java @@ -19,7 +19,7 @@ package com.android.server.wm; import android.os.IBinder; import android.os.RemoteException; import android.util.Slog; -import android.view.ITaskOrganizer; +import android.window.ITaskOrganizer; import android.view.SurfaceControl; import java.util.HashMap; diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java index aad242dbc338..236a62b7a05d 100644 --- a/services/core/java/com/android/server/wm/DisplayContent.java +++ b/services/core/java/com/android/server/wm/DisplayContent.java @@ -199,7 +199,7 @@ import android.view.DisplayInfo; import android.view.Gravity; import android.view.IDisplayWindowInsetsController; import android.view.ISystemGestureExclusionListener; -import android.view.ITaskOrganizer; +import android.window.ITaskOrganizer; import android.view.IWindow; import android.view.InputChannel; import android.view.InputDevice; diff --git a/services/core/java/com/android/server/wm/DisplayRotation.java b/services/core/java/com/android/server/wm/DisplayRotation.java index 57babb0eeaa0..776a9863dc6a 100644 --- a/services/core/java/com/android/server/wm/DisplayRotation.java +++ b/services/core/java/com/android/server/wm/DisplayRotation.java @@ -54,7 +54,7 @@ import android.util.SparseArray; import android.view.IDisplayWindowRotationCallback; import android.view.IWindowManager; import android.view.Surface; -import android.view.WindowContainerTransaction; +import android.window.WindowContainerTransaction; import com.android.internal.R; import com.android.internal.annotations.VisibleForTesting; diff --git a/services/core/java/com/android/server/wm/Task.java b/services/core/java/com/android/server/wm/Task.java index fb079f355867..eca7d2e19288 100644 --- a/services/core/java/com/android/server/wm/Task.java +++ b/services/core/java/com/android/server/wm/Task.java @@ -129,7 +129,7 @@ import android.util.DisplayMetrics; import android.util.Slog; import android.util.proto.ProtoOutputStream; import android.view.DisplayInfo; -import android.view.ITaskOrganizer; +import android.window.ITaskOrganizer; import android.view.RemoteAnimationAdapter; import android.view.RemoteAnimationTarget; import android.view.Surface; diff --git a/services/core/java/com/android/server/wm/TaskOrganizerController.java b/services/core/java/com/android/server/wm/TaskOrganizerController.java index 82c590d1920a..9bf4d6355071 100644 --- a/services/core/java/com/android/server/wm/TaskOrganizerController.java +++ b/services/core/java/com/android/server/wm/TaskOrganizerController.java @@ -29,7 +29,6 @@ import static com.android.server.wm.WindowContainer.POSITION_TOP; import android.annotation.Nullable; import android.app.ActivityManager.RunningTaskInfo; -import android.app.ITaskOrganizerController; import android.app.WindowConfiguration; import android.content.pm.ActivityInfo; import android.content.res.Configuration; @@ -39,10 +38,11 @@ import android.os.IBinder; import android.os.RemoteException; import android.util.ArraySet; import android.util.Slog; -import android.view.ITaskOrganizer; -import android.view.IWindowContainer; import android.view.SurfaceControl; -import android.view.WindowContainerTransaction; +import android.window.ITaskOrganizerController; +import android.window.ITaskOrganizer; +import android.window.IWindowContainer; +import android.window.WindowContainerTransaction; import com.android.internal.util.ArrayUtils; import com.android.internal.util.function.pooled.PooledConsumer; diff --git a/services/core/java/com/android/server/wm/WindowContainer.java b/services/core/java/com/android/server/wm/WindowContainer.java index a1902bbd6764..6c69dc625a70 100644 --- a/services/core/java/com/android/server/wm/WindowContainer.java +++ b/services/core/java/com/android/server/wm/WindowContainer.java @@ -68,7 +68,7 @@ import android.util.Pools; import android.util.Slog; import android.util.proto.ProtoOutputStream; import android.view.DisplayInfo; -import android.view.IWindowContainer; +import android.window.IWindowContainer; import android.view.MagnificationSpec; import android.view.RemoteAnimationDefinition; import android.view.RemoteAnimationTarget; diff --git a/services/tests/wmtests/src/com/android/server/wm/ActivityStarterTests.java b/services/tests/wmtests/src/com/android/server/wm/ActivityStarterTests.java index 6eec649f2ba5..873fa0222002 100644 --- a/services/tests/wmtests/src/com/android/server/wm/ActivityStarterTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/ActivityStarterTests.java @@ -82,9 +82,9 @@ import android.os.RemoteException; import android.platform.test.annotations.Presubmit; import android.service.voice.IVoiceInteractionSession; import android.view.Gravity; -import android.view.ITaskOrganizer; -import android.view.IWindowContainer; +import android.window.IWindowContainer; import android.view.SurfaceControl; +import android.window.ITaskOrganizer; import androidx.test.filters.SmallTest; diff --git a/services/tests/wmtests/src/com/android/server/wm/TaskOrganizerTests.java b/services/tests/wmtests/src/com/android/server/wm/TaskOrganizerTests.java index 71c837e2b46e..1624bbc1d472 100644 --- a/services/tests/wmtests/src/com/android/server/wm/TaskOrganizerTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/TaskOrganizerTests.java @@ -60,10 +60,9 @@ import android.platform.test.annotations.Presubmit; import android.util.ArrayMap; import android.util.Rational; import android.view.Display; -import android.view.ITaskOrganizer; -import android.view.IWindowContainer; import android.view.SurfaceControl; -import android.view.WindowContainerTransaction; +import android.window.ITaskOrganizer; +import android.window.WindowContainerTransaction; import androidx.test.filters.SmallTest; @@ -74,7 +73,7 @@ import java.util.ArrayList; import java.util.List; /** - * Test class for {@link ITaskOrganizer} and {@link android.app.ITaskOrganizerController}. + * Test class for {@link ITaskOrganizer} and {@link android.window.ITaskOrganizerController}. * * Build/Install/Run: * atest WmTests:TaskOrganizerTests diff --git a/tests/TaskOrganizerTest/src/com/android/test/taskembed/TaskOrganizerMultiWindowTest.java b/tests/TaskOrganizerTest/src/com/android/test/taskembed/TaskOrganizerMultiWindowTest.java index 6eb4587c8b55..cb75c8ba5873 100644 --- a/tests/TaskOrganizerTest/src/com/android/test/taskembed/TaskOrganizerMultiWindowTest.java +++ b/tests/TaskOrganizerTest/src/com/android/test/taskembed/TaskOrganizerMultiWindowTest.java @@ -27,17 +27,14 @@ import android.content.Intent; import android.graphics.Color; import android.graphics.Rect; import android.os.Bundle; -import android.os.RemoteException; import android.view.Gravity; -import android.view.ITaskOrganizer; -import android.view.IWindowContainer; import android.view.MotionEvent; import android.view.SurfaceControl; import android.view.SurfaceHolder; import android.view.View; import android.view.ViewGroup; -import android.view.WindowContainerTransaction; -import android.widget.FrameLayout; +import android.window.ITaskOrganizer; +import android.window.WindowContainerTransaction; import android.widget.LinearLayout; public class TaskOrganizerMultiWindowTest extends Activity { diff --git a/tests/TaskOrganizerTest/src/com/android/test/taskembed/TaskOrganizerPipTest.java b/tests/TaskOrganizerTest/src/com/android/test/taskembed/TaskOrganizerPipTest.java index ade5c2e21fd9..177841d97ff5 100644 --- a/tests/TaskOrganizerTest/src/com/android/test/taskembed/TaskOrganizerPipTest.java +++ b/tests/TaskOrganizerTest/src/com/android/test/taskembed/TaskOrganizerPipTest.java @@ -24,11 +24,10 @@ import android.app.Service; import android.content.Intent; import android.graphics.Rect; import android.os.IBinder; -import android.view.ITaskOrganizer; -import android.view.IWindowContainer; import android.view.SurfaceControl; import android.view.ViewGroup; -import android.view.WindowContainerTransaction; +import android.window.ITaskOrganizer; +import android.window.WindowContainerTransaction; import android.view.WindowManager; import android.widget.FrameLayout; diff --git a/tests/TaskOrganizerTest/src/com/android/test/taskembed/TaskView.java b/tests/TaskOrganizerTest/src/com/android/test/taskembed/TaskView.java index 0086fb7d92e9..438a06223f3c 100644 --- a/tests/TaskOrganizerTest/src/com/android/test/taskembed/TaskView.java +++ b/tests/TaskOrganizerTest/src/com/android/test/taskembed/TaskView.java @@ -18,11 +18,11 @@ package com.android.test.taskembed; import android.app.ActivityTaskManager; import android.content.Context; -import android.view.ITaskOrganizer; -import android.view.IWindowContainer; +import android.window.IWindowContainer; import android.view.SurfaceControl; import android.view.SurfaceHolder; import android.view.SurfaceView; +import android.window.ITaskOrganizer; /** * Simple SurfaceView wrapper which registers a TaskOrganizer |