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

Commit e6605221 authored by Tony Huang's avatar Tony Huang Committed by Android (Google) Code Review
Browse files

Merge "Cleanup the legacy split screen (2/n)"

parents b62fc571 0feb3c43

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/draganddrop/DragAndDropPolicyTest.java

+0 −4
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ package com.android.wm.shell.draganddrop; 
import static android.app.WindowConfiguration.ACTIVITY_TYPE_HOME;

import static android.app.WindowConfiguration.ACTIVITY_TYPE_STANDARD;

import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN;

import static android.app.WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_PRIMARY;

import static android.content.ClipDescription.MIMETYPE_APPLICATION_ACTIVITY;

import static android.content.ClipDescription.MIMETYPE_APPLICATION_SHORTCUT;

import static android.content.ClipDescription.MIMETYPE_APPLICATION_TASK;
@@ -111,7 +110,6 @@ public class DragAndDropPolicyTest { 
    private ActivityManager.RunningTaskInfo mHomeTask;

    private ActivityManager.RunningTaskInfo mFullscreenAppTask;

    private ActivityManager.RunningTaskInfo mNonResizeableFullscreenAppTask;

    private ActivityManager.RunningTaskInfo mSplitPrimaryAppTask;



    @Before

    public void setUp() throws RemoteException {
@@ -144,8 +142,6 @@ public class DragAndDropPolicyTest { 
        mNonResizeableFullscreenAppTask =

                createTaskInfo(WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD);

        mNonResizeableFullscreenAppTask.isResizeable = false;

        mSplitPrimaryAppTask = createTaskInfo(WINDOWING_MODE_SPLIT_SCREEN_PRIMARY,

                ACTIVITY_TYPE_STANDARD);



        setRunningTask(mFullscreenAppTask);

    }

services/tests/wmtests/src/com/android/server/wm/ActivityRecordTests.java

+2 −3
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ import static android.app.WindowConfiguration.ACTIVITY_TYPE_STANDARD; 
import static android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM;

import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN;

import static android.app.WindowConfiguration.WINDOWING_MODE_MULTI_WINDOW;

import static android.app.WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_PRIMARY;

import static android.content.pm.ActivityInfo.CONFIG_ORIENTATION;

import static android.content.pm.ActivityInfo.CONFIG_SCREEN_LAYOUT;

import static android.content.pm.ActivityInfo.FLAG_SUPPORTS_PICTURE_IN_PICTURE;
@@ -571,7 +570,7 @@ public class ActivityRecordTests extends WindowTestsBase { 
        final ActivityRecord activity = createActivityWith2LevelTask();

        final Task task = activity.getTask();

        final Task rootTask = activity.getRootTask();

        rootTask.setWindowingMode(WINDOWING_MODE_SPLIT_SCREEN_PRIMARY);

        rootTask.setWindowingMode(WINDOWING_MODE_MULTI_WINDOW);

        final Rect stableRect = new Rect();

        rootTask.mDisplayContent.getStableRect(stableRect);
@@ -616,7 +615,7 @@ public class ActivityRecordTests extends WindowTestsBase { 
        spyOn(tda);

        doReturn(true).when(tda).supportsNonResizableMultiWindow();

        final Task rootTask = mDisplayContent.getDefaultTaskDisplayArea().createRootTask(

                WINDOWING_MODE_SPLIT_SCREEN_PRIMARY, ACTIVITY_TYPE_STANDARD, true /* onTop */);

                WINDOWING_MODE_MULTI_WINDOW, ACTIVITY_TYPE_STANDARD, true /* onTop */);

        rootTask.setBounds(0, 0, 1000, 500);

        final ActivityRecord activity = new ActivityBuilder(mAtm)

                .setParentTask(rootTask)

services/tests/wmtests/src/com/android/server/wm/DisplayContentTests.java

+2 −2
Original line number Diff line number Diff line
@@ -1102,7 +1102,7 @@ public class DisplayContentTests extends WindowTestsBase { 
        final DisplayContent dc = createNewDisplay();

        dc.setImeLayeringTarget(createWindow(null, TYPE_STATUS_BAR, "app"));

        dc.getImeTarget(IME_TARGET_LAYERING).getWindow().setWindowingMode(

                WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_PRIMARY);

                WindowConfiguration.WINDOWING_MODE_MULTI_WINDOW);

        assertEquals(dc.getImeContainer().getParentSurfaceControl(), dc.computeImeParent());

    }
@@ -1153,7 +1153,7 @@ public class DisplayContentTests extends WindowTestsBase { 
        final DisplayContent dc = createNewDisplay();

        dc.setImeInputTarget(createWindow(null, TYPE_BASE_APPLICATION, "app"));

        dc.getImeTarget(IME_TARGET_INPUT).getWindow().setWindowingMode(

                WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_PRIMARY);

                WindowConfiguration.WINDOWING_MODE_MULTI_WINDOW);

        dc.setImeLayeringTarget(dc.getImeTarget(IME_TARGET_INPUT).getWindow());

        dc.setRemoteInsetsController(createDisplayWindowInsetsController());

        assertNotEquals(dc.getImeTarget(IME_TARGET_INPUT).getWindow(),

services/tests/wmtests/src/com/android/server/wm/InsetsStateControllerTest.java

+1 −2
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ package com.android.server.wm; 
import static android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM;

import static android.app.WindowConfiguration.WINDOWING_MODE_MULTI_WINDOW;

import static android.app.WindowConfiguration.WINDOWING_MODE_PINNED;

import static android.app.WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_PRIMARY;

import static android.view.InsetsState.ITYPE_CLIMATE_BAR;

import static android.view.InsetsState.ITYPE_EXTRA_NAVIGATION_BAR;

import static android.view.InsetsState.ITYPE_IME;
@@ -246,7 +245,7 @@ public class InsetsStateControllerTest extends WindowTestsBase { 
        final WindowState child = createWindow(app, TYPE_APPLICATION, "child");

        app.mAboveInsetsState.addSource(getController().getRawInsetsState().peekSource(ITYPE_IME));

        child.mAttrs.flags |= FLAG_NOT_FOCUSABLE;

        child.setWindowingMode(WINDOWING_MODE_SPLIT_SCREEN_PRIMARY);

        child.setWindowingMode(WINDOWING_MODE_MULTI_WINDOW);



        mDisplayContent.computeImeTarget(true);

        mDisplayContent.setLayoutNeeded();

services/tests/wmtests/src/com/android/server/wm/LaunchParamsControllerTests.java

+1 −2
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ import static android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM; 
import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN;

import static android.app.WindowConfiguration.WINDOWING_MODE_MULTI_WINDOW;

import static android.app.WindowConfiguration.WINDOWING_MODE_PINNED;

import static android.app.WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_SECONDARY;

import static android.view.Display.INVALID_DISPLAY;



import static com.android.dx.mockito.inline.extended.ExtendedMockito.any;
@@ -334,7 +333,7 @@ public class LaunchParamsControllerTests extends WindowTestsBase { 
        params.mWindowingMode = windowingMode;

        final InstrumentedPositioner positioner = new InstrumentedPositioner(RESULT_DONE, params);

        final Task task = new TaskBuilder(mAtm.mTaskSupervisor).setCreateParentTask(true).build();

        task.getRootTask().setWindowingMode(WINDOWING_MODE_SPLIT_SCREEN_SECONDARY);

        task.getRootTask().setWindowingMode(WINDOWING_MODE_MULTI_WINDOW);



        mController.registerModifier(positioner);