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

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

Merge "Make PINNED mode alwaysCreateStack" into rvc-dev am: 71d6e687 

Change-Id: I569a9a09b0baeb07d43314b927fc685e9ddb2eea
parents 9a022dc6 71d6e687

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

+5 −0
Original line number Diff line number Diff line
@@ -783,6 +783,11 @@ class ActivityStack extends Task { 
        if (currentMode == WINDOWING_MODE_PINNED) {

            mAtmService.getTaskChangeNotificationController().notifyActivityUnpinned();

        }

        if (likelyResolvedMode == WINDOWING_MODE_PINNED

                && taskDisplayArea.getRootPinnedTask() != null) {

            // Can only have 1 pip at a time, so replace an existing pip

            taskDisplayArea.getRootPinnedTask().dismissPip();

        }

        if (likelyResolvedMode != WINDOWING_MODE_FULLSCREEN

                && topActivity != null && !topActivity.noDisplay

                && topActivity.isNonResizableOrForcedResizable(likelyResolvedMode)) {

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

+2 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import static android.app.WindowConfiguration.ROTATION_UNDEFINED; 
import static android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM;

import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN;

import static android.app.WindowConfiguration.WINDOWING_MODE_MULTI_WINDOW;

import static android.app.WindowConfiguration.WINDOWING_MODE_PINNED;

import static android.app.WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_SECONDARY;

import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED;

import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_UNSET;
@@ -5028,6 +5029,7 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo 
        return activityType == ACTIVITY_TYPE_STANDARD

                && (windowingMode == WINDOWING_MODE_FULLSCREEN

                || windowingMode == WINDOWING_MODE_FREEFORM

                || windowingMode == WINDOWING_MODE_PINNED

                || windowingMode == WINDOWING_MODE_SPLIT_SCREEN_SECONDARY

                || windowingMode == WINDOWING_MODE_MULTI_WINDOW);

    }

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

+1 −0
Original line number Diff line number Diff line
@@ -3072,6 +3072,7 @@ class Task extends WindowContainer<WindowContainer> { 
        mForceShowForAllUsers = forceShowForAllUsers;

    }



    @Override

    public boolean isAttached() {

        final TaskDisplayArea taskDisplayArea = getDisplayArea();

        return taskDisplayArea != null && !taskDisplayArea.isRemoved();

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

+5 −0
Original line number Diff line number Diff line
@@ -879,6 +879,11 @@ final class TaskDisplayArea extends DisplayArea<ActivityStack> { 
                    + windowingMode);

        }



        if (windowingMode == WINDOWING_MODE_PINNED && getRootPinnedTask() != null) {

            // Only 1 stack can be PINNED at a time, so dismiss the existing one

            getRootPinnedTask().dismissPip();

        }



        final int stackId = getNextStackId();

        return createStackUnchecked(windowingMode, activityType, stackId, onTop, info, intent,

                createdByOrganizer);

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

+4 −0
Original line number Diff line number Diff line
@@ -737,6 +737,10 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer< 
        return parent != null ? parent.getDisplayArea() : null;

    }



    boolean isAttached() {

        return getDisplayArea() != null;

    }



    void setWaitingForDrawnIfResizingChanged() {

        for (int i = mChildren.size() - 1; i >= 0; --i) {

            final WindowContainer wc = mChildren.get(i);