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

Commit 979db138 authored by Leon Jeng's avatar Leon Jeng Committed by Automerger Merge Worker
Browse files

Revert "Not show size compat UI when task is not visible" am: 76370b6f 

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

Change-Id: Ib61cabd6c4d77d4fa5cd3f64b2272fcd684db153
parents d6cbda78 76370b6f

core/java/android/app/TaskInfo.java

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

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

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

                    == that.configuration.getLayoutDirection())

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

                    == that.configuration.getLayoutDirection());

    }



    /**

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.isVisible) {

                || !taskInfo.topActivityInSizeCompat) {

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

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

            return;

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

+0 −13
Original line number Diff line number Diff line
@@ -305,23 +305,10 @@ 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.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,