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

Commit 14a3fb98 authored by Wale Ogunwale's avatar Wale Ogunwale
Browse files

Switched TaskStack to use WindowContainer 

Bug: 30060889
Test: Manual testing and existing tests still pass.
Change-Id: Id29c4aaf6580623a748bd69316fc6a4663ff1d37
parent 3d288b3e

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

+1 −2
Original line number Diff line number Diff line
@@ -772,8 +772,7 @@ class DisplayContent { 
                final TaskStack appStack = wtoken.mTask.mStack;



                // TODO: Use WindowContainer.compareTo() once everything is using WindowContainer

                if ((focusedAppStack == appStack

                        && appStack.isFirstGreaterThanSecond(focusedApp, wtoken))

                if ((focusedAppStack == appStack && focusedApp.compareTo(wtoken) > 0)

                        || mStacks.indexOf(focusedAppStack) > mStacks.indexOf(appStack)) {

                    // App stack below focused app stack. No focus for you!!!

                    if (DEBUG_FOCUS_LIGHT) Slog.v(TAG_WM,

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

+4 −5
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ class Task extends WindowContainer<AppWindowToken> implements DimLayer.DimLayerU 
        if (content != null) {

            content.mDimLayerController.removeDimLayerUser(this);

        }

        mStack.removeTask(this);

        mParent.removeChild(this);

        mService.mTaskIdToTask.delete(mTaskId);

    }
@@ -165,9 +165,7 @@ class Task extends WindowContainer<AppWindowToken> implements DimLayer.DimLayerU 
        if (DEBUG_STACK) Slog.i(TAG, "moveTaskToStack: removing taskId=" + mTaskId

                + " from stack=" + mStack);

        EventLog.writeEvent(EventLogTags.WM_TASK_REMOVED, mTaskId, "moveTask");

        if (mStack != null) {

            mStack.removeTask(this);

        }

        mParent.removeChild(this);

        stack.addTask(this, toTop);

    }
@@ -176,7 +174,7 @@ class Task extends WindowContainer<AppWindowToken> implements DimLayer.DimLayerU 
            if (DEBUG_STACK) Slog.i(TAG, "positionTaskInStack: removing taskId=" + mTaskId

                    + " from stack=" + mStack);

            EventLog.writeEvent(EventLogTags.WM_TASK_REMOVED, mTaskId, "moveTask");

            mStack.removeTask(this);

            mStack.removeChild(this);

        }

        stack.positionTask(this, position, showForAllUsers());

        resizeLocked(bounds, config, false /* force */);
@@ -186,6 +184,7 @@ class Task extends WindowContainer<AppWindowToken> implements DimLayer.DimLayerU 
        }

    }



    @Override

    void removeChild(AppWindowToken token) {

        if (!mChildren.contains(token)) {

            Slog.e(TAG, "removeChild: token=" + this + " not found.");

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

+1 −1
Original line number Diff line number Diff line
@@ -477,7 +477,7 @@ class TaskPositioner implements DimLayer.DimLayerUser { 
     */

    private int getDimSide(int x) {

        if (mTask.mStack.mStackId != FREEFORM_WORKSPACE_STACK_ID

                || !mTask.mStack.isFullscreen()

                || !mTask.mStack.fillsParent()

                || mService.mGlobalConfiguration.orientation != ORIENTATION_LANDSCAPE) {

            return CTRL_NONE;

        }

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

+95 −206

File changed.

Preview size limit exceeded, changes collapsed.

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

+1 −1
Original line number Diff line number Diff line
@@ -1569,7 +1569,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP 


    boolean isObscuringFullscreen(final DisplayInfo displayInfo) {

        Task task = getTask();

        if (task != null && task.mStack != null && !task.mStack.isFullscreen()) {

        if (task != null && task.mStack != null && !task.mStack.fillsParent()) {

            return false;

        }

        if (!isOpaqueDrawn() || !isFrameFullscreen(displayInfo)) {