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

Commit 42439214 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes Ifd466d1e,I9f57651a 

* changes:
  Don't set windowing mode in fullscreen displays.
  Only persist launch params on freeform display.
parents c8d53875 a7a919c0

core/java/android/app/WindowConfiguration.java

+5 −0
Original line number Diff line number Diff line
@@ -338,6 +338,11 @@ public class WindowConfiguration implements Parcelable, Comparable<WindowConfigu 
        mDisplayWindowingMode = windowingMode;

    }



    /** @hide */

    @WindowingMode

    public int getDisplayWindowingMode() {

        return mDisplayWindowingMode;

    }



    public void setActivityType(@ActivityType int activityType) {

        if (mActivityType == activityType) {

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

+3 −1
Original line number Diff line number Diff line
@@ -211,7 +211,9 @@ class TaskLaunchParamsModifier implements LaunchParamsModifier { 
        if (!currentParams.isEmpty() && !hasInitialBounds

                && (!currentParams.hasPreferredDisplay()

                    || displayId == currentParams.mPreferredDisplayId)) {

            if (currentParams.hasWindowingMode()) {

            // Only set windowing mode if display is in freeform. If the display is in fullscreen

            // mode we should only launch a task in fullscreen mode.

            if (currentParams.hasWindowingMode() && display.inFreeformWindowingMode()) {

                launchMode = currentParams.mWindowingMode;

                fullyResolvedCurrentParam = launchMode != WINDOWING_MODE_FREEFORM;

                if (DEBUG) {

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

+10 −3
Original line number Diff line number Diff line
@@ -1908,7 +1908,7 @@ class TaskRecord extends ConfigurationContainer { 
    /**

     * Saves launching state if necessary so that we can launch the activity to its latest state.

     * It only saves state if this task has been shown to user and it's in fullscreen or freeform

     * mode.

     * mode on freeform displays.

     */

    void saveLaunchingStateIfNeeded() {

        if (!hasBeenVisible) {
@@ -1917,8 +1917,15 @@ class TaskRecord extends ConfigurationContainer { 
        }



        final int windowingMode = getWindowingMode();

        if (windowingMode != WindowConfiguration.WINDOWING_MODE_FULLSCREEN

                && windowingMode != WindowConfiguration.WINDOWING_MODE_FREEFORM) {

        if (windowingMode != WINDOWING_MODE_FULLSCREEN

                && windowingMode != WINDOWING_MODE_FREEFORM) {

            return;

        }



        // Don't persist state if display isn't in freeform mode. Then the task will be launched

        // back to its last state in a freeform display when it's launched in a freeform display

        // next time.

        if (getWindowConfiguration().getDisplayWindowingMode() != WINDOWING_MODE_FREEFORM) {

            return;

        }

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

+27 −1
Original line number Diff line number Diff line
@@ -345,6 +345,19 @@ public class TaskLaunchParamsModifierTests extends ActivityTestsBase { 
                WINDOWING_MODE_FULLSCREEN);

    }



    @Test

    public void testLaunchesFullscreenOnFullscreenDisplayWithFreeformHistory() {

        mCurrent.mPreferredDisplayId = Display.INVALID_DISPLAY;

        mCurrent.mWindowingMode = WINDOWING_MODE_FREEFORM;

        mCurrent.mBounds.set(0, 0, 200, 100);



        assertEquals(RESULT_CONTINUE, mTarget.onCalculate(/* task */ null, /* layout */ null,

                mActivity, /* source */ null, /* options */ null, mCurrent, mResult));



        assertEquivalentWindowingMode(WINDOWING_MODE_FULLSCREEN, mResult.mWindowingMode,

                WINDOWING_MODE_FULLSCREEN);

    }



    @Test

    public void testRespectsFullyResolvedCurrentParam_Fullscreen() {

        final TestActivityDisplay freeformDisplay = createNewActivityDisplay(
@@ -1173,6 +1186,19 @@ public class TaskLaunchParamsModifierTests extends ActivityTestsBase { 
        assertEquals(new Rect(0, 0, 1680, 953), mResult.mBounds);

    }



    @Test

    public void returnsNonFullscreenBoundsOnFullscreenDisplayWithFreeformHistory() {

        mCurrent.mPreferredDisplayId = Display.INVALID_DISPLAY;

        mCurrent.mWindowingMode = WINDOWING_MODE_FREEFORM;

        mCurrent.mBounds.set(0, 0, 200, 100);



        assertEquals(RESULT_CONTINUE, mTarget.onCalculate(/* task */ null, /* layout */ null,

                mActivity, /* source */ null, /* options */ null, mCurrent, mResult));



        // Returned bounds with in fullscreen mode will be set to last non-fullscreen bounds.

        assertEquals(new Rect(0, 0, 200, 100), mCurrent.mBounds);

    }



    @Test

    public void testAdjustsBoundsToFitInDisplayFullyResolvedBounds() {

        final TestActivityDisplay freeformDisplay = createNewActivityDisplay(
@@ -1186,7 +1212,7 @@ public class TaskLaunchParamsModifierTests extends ActivityTestsBase { 
        options.setLaunchDisplayId(freeformDisplay.mDisplayId);



        assertEquals(RESULT_CONTINUE, mTarget.onCalculate(/* task */ null, /* layout */ null,

                mActivity, /* source */ null, /* options */ null, mCurrent, mResult));

                mActivity, /* source */ null, options, mCurrent, mResult));



        assertEquals(new Rect(0, 0, 300, 300), mResult.mBounds);

    }