summaryrefslogtreecommitdiff
path: root/tests/TaskOrganizerTest
diff options
context:
space:
mode:
authorWale Ogunwale <ogunwale@google.com>2020-03-21 14:29:07 -0700
committerWale Ogunwale <ogunwale@google.com>2020-03-22 09:47:43 -0700
commit5794658be028d9aedb2936ec737a3a0f4c5d2ebc (patch)
tree8a0aa807f32a6be0fa0694aaf25619e69228107b /tests/TaskOrganizerTest
parentffd92af9a5b1df3c7fcc8c6e0845d111c9d819f0 (diff)
Move some window related files to android.window package
Window management files on the client side have normally been dumped in either android.view or android.app package. This CL starts to centralized them in android.window package so there is better separation. Test: they pass Bug: 147406652 Bug: 152113464 Bug: 152117221 Change-Id: I4d64bd256e9b3581af0ccf9396f7dd2454132719
Diffstat (limited to 'tests/TaskOrganizerTest')
-rw-r--r--tests/TaskOrganizerTest/src/com/android/test/taskembed/TaskOrganizerMultiWindowTest.java7
-rw-r--r--tests/TaskOrganizerTest/src/com/android/test/taskembed/TaskOrganizerPipTest.java5
-rw-r--r--tests/TaskOrganizerTest/src/com/android/test/taskembed/TaskView.java4
3 files changed, 6 insertions, 10 deletions
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