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

Commit 85a76668 authored by Chris Li's avatar Chris Li Committed by Automerger Merge Worker
Browse files

Merge "Not show size compat UI when task is not visible" into sc-dev am: 927c644b 

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

Change-Id: I7d380e2e6bb351db4bb5a8a68c236c3444ef2bf1
parents 8300e3b0 927c644b

core/java/android/app/TaskInfo.java

+2 −1
Original line number Diff line number Diff line
@@ -361,7 +361,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
@@ -497,7 +497,7 @@ public class ShellTaskOrganizer extends TaskOrganizer { 
        // 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 /* sizeCompatActivity*/,

                    null /* taskListener */);

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

+13 −0
Original line number Diff line number Diff line
@@ -306,10 +306,23 @@ public class ShellTaskOrganizerTests { 
        taskInfo2.displayId = taskInfo1.displayId;

        taskInfo2.topActivityToken = taskInfo1.topActivityToken;

        taskInfo2.topActivityInSizeCompat = true;

        taskInfo2.isVisible = true;

        mOrganizer.onTaskInfoChanged(taskInfo2);

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

                taskInfo1.configuration, taskInfo1.topActivityToken, 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.topActivityToken = taskInfo1.topActivityToken;

        taskInfo3.topActivityInSizeCompat = true;

        taskInfo3.isVisible = false;

        mOrganizer.onTaskInfoChanged(taskInfo3);

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

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



        clearInvocations(mSizeCompatUI);

        mOrganizer.onTaskVanished(taskInfo1);

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