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

Commit 9faa470a authored by Chris Li's avatar Chris Li Committed by Automerger Merge Worker
Browse files

Merge "Revert "Revert "Not show size compat UI when task is not visible"""... 

Merge "Revert "Revert "Not show size compat UI when task is not visible""" into sc-dev am: 50c03ea7 am: 886a6697

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15237129

Change-Id: I724309d4ee1d3bce6830951ff7d5cfe1692af51d
parents d044659e 886a6697

core/java/android/app/TaskInfo.java

+2 −1
Original line number Diff line number Diff line
@@ -367,7 +367,8 @@ public class TaskInfo { 
                && (!topActivityInSizeCompat || configuration.windowConfiguration.getBounds()

                    .equals(that.configuration.windowConfiguration.getBounds()))

                && (!topActivityInSizeCompat || configuration.getLayoutDirection()

                    == that.configuration.getLayoutDirection());

                    == that.configuration.getLayoutDirection())

                && (!topActivityInSizeCompat || isVisible == that.isVisible);

    }



    /**

libs/WindowManager/Shell/src/com/android/wm/shell/ShellTaskOrganizer.java

+1 −1
Original line number Diff line number Diff line
@@ -512,7 +512,7 @@ public class ShellTaskOrganizer extends TaskOrganizer implements 
        // The task is vanished or doesn't support size compat UI, notify to remove size compat UI

        // on this Task if there is any.

        if (taskListener == null || !taskListener.supportSizeCompatUI()

                || !taskInfo.topActivityInSizeCompat) {

                || !taskInfo.topActivityInSizeCompat || !taskInfo.isVisible) {

            mSizeCompatUI.onSizeCompatInfoChanged(taskInfo.displayId, taskInfo.taskId,

                    null /* taskConfig */, null /* taskListener */);

            return;

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

+12 −0
Original line number Diff line number Diff line
@@ -305,10 +305,22 @@ public class ShellTaskOrganizerTests { 
                createTaskInfo(taskInfo1.taskId, taskInfo1.getWindowingMode());

        taskInfo2.displayId = taskInfo1.displayId;

        taskInfo2.topActivityInSizeCompat = true;

        taskInfo2.isVisible = true;

        mOrganizer.onTaskInfoChanged(taskInfo2);

        verify(mSizeCompatUI).onSizeCompatInfoChanged(taskInfo1.displayId, taskInfo1.taskId,

                taskInfo1.configuration, taskListener);



        // Not show size compat UI if task is not visible.

        clearInvocations(mSizeCompatUI);

        final RunningTaskInfo taskInfo3 =

                createTaskInfo(taskInfo1.taskId, taskInfo1.getWindowingMode());

        taskInfo3.displayId = taskInfo1.displayId;

        taskInfo3.topActivityInSizeCompat = true;

        taskInfo3.isVisible = false;

        mOrganizer.onTaskInfoChanged(taskInfo3);

        verify(mSizeCompatUI).onSizeCompatInfoChanged(taskInfo1.displayId, taskInfo1.taskId,

                null /* taskConfig */, null /* taskListener */);



        clearInvocations(mSizeCompatUI);

        mOrganizer.onTaskVanished(taskInfo1);

        verify(mSizeCompatUI).onSizeCompatInfoChanged(taskInfo1.displayId, taskInfo1.taskId,