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

Commit 8494acd9 authored by Vali Calinescu's avatar Vali Calinescu
Browse files

Change TaskInfo topActivityInSizeCompat to look at visibility 

Right now the TaskInfo is looking for the top activity to be resumed and in size compat mode in order to populate topActivityInSizeCompat. We want to change the "resume" to "visible", which will fix a bug where a paused activity that is in size compat mode does not have a visible restart button.

Fix: 271586422
Test: atest WmTests:SizeCompatTests#testTopActivityInSizeCompatMode_pausedAndInSizeCompatMode_returnsTrue
Test: atest WmTests:WindowOrganizerTests#testSizeCompatModeChangedOnFirstOrganizedTask
Change-Id: I56f643210018201f18830d640e786b4fc3c246c8
parent 82c8b4e3

services/core/java/com/android/server/wm/Task.java

+4 −2
Original line number Diff line number Diff line
@@ -3453,8 +3453,10 @@ class Task extends TaskFragment { 


        final boolean isTopActivityResumed = top != null

                && top.getOrganizedTask() == this && top.isState(RESUMED);

        // Whether the direct top activity is in size compat mode on foreground.

        info.topActivityInSizeCompat = isTopActivityResumed && top.inSizeCompatMode();

        final boolean isTopActivityVisible = top != null

                && top.getOrganizedTask() == this && top.isVisible();

        // Whether the direct top activity is in size compat mode

        info.topActivityInSizeCompat = isTopActivityVisible && top.inSizeCompatMode();

        if (info.topActivityInSizeCompat

                && mWmService.mLetterboxConfiguration.isTranslucentLetterboxingEnabled()) {

            // We hide the restart button in case of transparent activities.

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

+19 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ import static com.android.internal.util.FrameworkStatsLog.APP_COMPAT_STATE_CHANG 
import static com.android.internal.util.FrameworkStatsLog.APP_COMPAT_STATE_CHANGED__STATE__LETTERBOXED_FOR_SIZE_COMPAT_MODE;

import static com.android.internal.util.FrameworkStatsLog.APP_COMPAT_STATE_CHANGED__STATE__NOT_LETTERBOXED;

import static com.android.internal.util.FrameworkStatsLog.APP_COMPAT_STATE_CHANGED__STATE__NOT_VISIBLE;

import static com.android.server.wm.ActivityRecord.State.PAUSED;

import static com.android.server.wm.ActivityRecord.State.RESTARTING_PROCESS;

import static com.android.server.wm.ActivityRecord.State.RESUMED;

import static com.android.server.wm.ActivityRecord.State.STOPPED;
@@ -3884,6 +3885,24 @@ public class SizeCompatTests extends WindowTestsBase { 
        assertTrue(mActivity.inSizeCompatMode());

    }



    @Test

    public void testTopActivityInSizeCompatMode_pausedAndInSizeCompatMode_returnsTrue() {

        setUpDisplaySizeWithApp(1000, 2500);

        mActivity.mDisplayContent.setIgnoreOrientationRequest(true /* ignoreOrientationRequest */);



        spyOn(mActivity);

        doReturn(mTask).when(mActivity).getOrganizedTask();

        prepareUnresizable(mActivity, SCREEN_ORIENTATION_PORTRAIT);



        rotateDisplay(mActivity.mDisplayContent, ROTATION_90);

        mActivity.setState(PAUSED, "test");



        assertTrue(mActivity.inSizeCompatMode());

        assertEquals(mActivity.getState(), PAUSED);

        assertTrue(mActivity.isVisible());

        assertTrue(mTask.getTaskInfo().topActivityInSizeCompat);

    }



    /**

     * Tests that all three paths in which aspect ratio logic can be applied yield the same

     * result, which is that aspect ratio is respected on app bounds. The three paths are

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

+3 −3
Original line number Diff line number Diff line
@@ -1485,9 +1485,9 @@ public class WindowOrganizerTests extends WindowTestsBase { 
        assertEquals(rootTask.mTaskId, info.taskId);

        assertTrue(info.topActivityInSizeCompat);



        // Ensure task info show top activity that is not in foreground as not in size compat.

        // Ensure task info show top activity that is not visible as not in size compat.

        clearInvocations(organizer);

        doReturn(false).when(activity).isState(RESUMED);

        doReturn(false).when(activity).isVisible();

        rootTask.onSizeCompatActivityChanged();

        mWm.mAtmService.mTaskOrganizerController.dispatchPendingEvents();

        verify(organizer).onTaskInfoChanged(infoCaptor.capture());
@@ -1497,7 +1497,7 @@ public class WindowOrganizerTests extends WindowTestsBase { 


        // Ensure task info show non size compat top activity as not in size compat.

        clearInvocations(organizer);

        doReturn(true).when(activity).isState(RESUMED);

        doReturn(true).when(activity).isVisible();

        doReturn(false).when(activity).inSizeCompatMode();

        rootTask.onSizeCompatActivityChanged();

        mWm.mAtmService.mTaskOrganizerController.dispatchPendingEvents();