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

Commit 77ad720e authored by Evan Rosky's avatar Evan Rosky Committed by Automerger Merge Worker
Browse files

Merge "Remove unused restore-mode logic in ActivityStack" into rvc-dev am:... 

Merge "Remove unused restore-mode logic in ActivityStack" into rvc-dev am: 99ed6ce7 am: 81f2ea40 am: f22129fa am: 8c932a14

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

Change-Id: I3b1f294a592e64de04c8a0fd1a085f307791254e
parents 6d40d7de 8c932a14

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

+6 −44
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ import static android.app.WindowConfiguration.ACTIVITY_TYPE_UNDEFINED; 
import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN;

import static android.app.WindowConfiguration.WINDOWING_MODE_PINNED;

import static android.app.WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_PRIMARY;

import static android.app.WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_SECONDARY;

import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED;

import static android.app.WindowConfiguration.activityTypeToString;

import static android.app.WindowConfiguration.windowingModeToString;
@@ -269,9 +268,6 @@ class ActivityStack extends Task { 
    private final AnimatingActivityRegistry mAnimatingActivityRegistry =

            new AnimatingActivityRegistry();



    /** Stores the override windowing-mode from before a transient mode change (eg. split) */

    private int mRestoreOverrideWindowingMode = WINDOWING_MODE_UNDEFINED;



    private boolean mTopActivityOccludesKeyguard;

    private ActivityRecord mTopDismissingKeyguardActivity;
@@ -661,19 +657,6 @@ class ActivityStack extends Task { 
        setWindowingMode(windowingMode, false /* creating */);

    }



    /**

     * A transient windowing mode is one which activities enter into temporarily. Examples of this

     * are Split window modes and pip. Non-transient modes are modes that displays can adopt.

     *

     * @param windowingMode the windowingMode to test for transient-ness.

     * @return {@code true} if the windowing mode is transient, {@code false} otherwise.

     */

    private static boolean isTransientWindowingMode(int windowingMode) {

        return windowingMode == WINDOWING_MODE_PINNED

                || windowingMode == WINDOWING_MODE_SPLIT_SCREEN_PRIMARY

                || windowingMode == WINDOWING_MODE_SPLIT_SCREEN_SECONDARY;

    }



    /**

     * Specialization of {@link #setWindowingMode(int)} for this subclass.

     *
@@ -698,11 +681,6 @@ class ActivityStack extends Task { 
        final int currentOverrideMode = getRequestedOverrideWindowingMode();

        final Task topTask = getTopMostTask();

        int windowingMode = preferredWindowingMode;

        if (preferredWindowingMode == WINDOWING_MODE_UNDEFINED

                && isTransientWindowingMode(currentMode)) {

            // Leaving a transient mode. Interpret UNDEFINED as "restore"

            windowingMode = mRestoreOverrideWindowingMode;

        }



        // Need to make sure windowing mode is supported. If we in the process of creating the stack

        // no need to resolve the windowing mode again as it is already resolved to the right mode.
@@ -712,30 +690,17 @@ class ActivityStack extends Task { 
                windowingMode = WINDOWING_MODE_UNDEFINED;

            }

        }

        if (taskDisplayArea.getRootSplitScreenPrimaryTask() == this

                && windowingMode == WINDOWING_MODE_SPLIT_SCREEN_SECONDARY) {

            // Resolution to split-screen secondary for the primary split-screen stack means

            // we want to leave split-screen mode.

            windowingMode = mRestoreOverrideWindowingMode;

        }



        final boolean alreadyInSplitScreenMode = taskDisplayArea.isSplitScreenModeActivated();



        // Take any required action due to us not supporting the preferred windowing mode.

        if (alreadyInSplitScreenMode && windowingMode == WINDOWING_MODE_FULLSCREEN

        if (creating && alreadyInSplitScreenMode && windowingMode == WINDOWING_MODE_FULLSCREEN

                && isActivityTypeStandardOrUndefined()) {

            final boolean preferredSplitScreen =

                    preferredWindowingMode == WINDOWING_MODE_SPLIT_SCREEN_PRIMARY

                    || preferredWindowingMode == WINDOWING_MODE_SPLIT_SCREEN_SECONDARY;

            if (preferredSplitScreen || creating) {

                // Looks like we can't launch in split screen mode or the stack we are launching

                // doesn't support split-screen mode, go ahead an dismiss split-screen and display a

                // warning toast about it.

            // If the stack is being created explicitly in fullscreen mode, dismiss split-screen

            // and display a warning toast about it.

            mAtmService.getTaskChangeNotificationController()

                    .notifyActivityDismissingDockedStack();

            taskDisplayArea.onSplitScreenModeDismissed(this);

        }

        }



        if (currentMode == windowingMode) {

            // You are already in the window mode, so we can skip most of the work below. However,
@@ -797,9 +762,6 @@ class ActivityStack extends Task { 
                        + " while there is already one isn't currently supported");

                //return;

            }

            if (isTransientWindowingMode(windowingMode) && !isTransientWindowingMode(currentMode)) {

                mRestoreOverrideWindowingMode = currentOverrideMode;

            }



            mTmpRect2.setEmpty();

            if (windowingMode != WINDOWING_MODE_FULLSCREEN) {