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

Commit 7fbdaba4 authored by Jorge Gil's avatar Jorge Gil
Browse files

Add DesktopModeWindowDecorViewModel to WMShell dump 

Bug: 296921167
Test: dump WMShell, check state is visible
Change-Id: If9111c894368cc98d8ee0346dafc359b936f2fbc
parent cea6bf39

libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellModule.java

+2 −0
Original line number Diff line number Diff line
@@ -199,6 +199,7 @@ public abstract class WMShellModule { 
            @ShellMainThread Handler mainHandler,

            @ShellMainThread Choreographer mainChoreographer,

            ShellInit shellInit,

            ShellCommandHandler shellCommandHandler,

            ShellTaskOrganizer taskOrganizer,

            DisplayController displayController,

            ShellController shellController,
@@ -213,6 +214,7 @@ public abstract class WMShellModule { 
                    mainHandler,

                    mainChoreographer,

                    shellInit,

                    shellCommandHandler,

                    taskOrganizer,

                    displayController,

                    shellController,

libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorViewModel.java

+26 −1
Original line number Diff line number Diff line
@@ -79,11 +79,13 @@ import com.android.wm.shell.recents.RecentsTransitionStateListener; 
import com.android.wm.shell.splitscreen.SplitScreen;

import com.android.wm.shell.splitscreen.SplitScreenController;

import com.android.wm.shell.sysui.KeyguardChangeListener;

import com.android.wm.shell.sysui.ShellCommandHandler;

import com.android.wm.shell.sysui.ShellController;

import com.android.wm.shell.sysui.ShellInit;

import com.android.wm.shell.transition.Transitions;

import com.android.wm.shell.windowdecor.DesktopModeWindowDecoration.ExclusionRegionListener;



import java.io.PrintWriter;

import java.util.Optional;

import java.util.function.Supplier;
@@ -97,6 +99,7 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { 


    private final DesktopModeWindowDecoration.Factory mDesktopModeWindowDecorFactory;

    private final ActivityTaskManager mActivityTaskManager;

    private final ShellCommandHandler mShellCommandHandler;

    private final ShellTaskOrganizer mTaskOrganizer;

    private final ShellController mShellController;

    private final Context mContext;
@@ -134,6 +137,7 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { 
            Handler mainHandler,

            Choreographer mainChoreographer,

            ShellInit shellInit,

            ShellCommandHandler shellCommandHandler,

            ShellTaskOrganizer taskOrganizer,

            DisplayController displayController,

            ShellController shellController,
@@ -148,6 +152,7 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { 
                mainHandler,

                mainChoreographer,

                shellInit,

                shellCommandHandler,

                taskOrganizer,

                displayController,

                shellController,
@@ -167,6 +172,7 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { 
            Handler mainHandler,

            Choreographer mainChoreographer,

            ShellInit shellInit,

            ShellCommandHandler shellCommandHandler,

            ShellTaskOrganizer taskOrganizer,

            DisplayController displayController,

            ShellController shellController,
@@ -189,7 +195,7 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { 
        mTransitions = transitions;

        mDesktopTasksController = desktopTasksController;

        mRecentsTransitionHandler = recentsTransitionHandler;



        mShellCommandHandler = shellCommandHandler;

        mDesktopModeWindowDecorFactory = desktopModeWindowDecorFactory;

        mInputMonitorFactory = inputMonitorFactory;

        mTransactionFactory = transactionFactory;
@@ -206,6 +212,7 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { 
                onRecentsTransitionStarted(transition);

            }

        });

        mShellCommandHandler.addDumpCallback(this::dump, this);

    }



    @Override
@@ -593,6 +600,15 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { 
            super.dispose();

        }



        @Override

        public String toString() {

            return "EventReceiver"

                    + "{"

                    + "tasksOnDisplay="

                    + mTasksOnDisplay

                    + "}";

        }



        private void incrementTaskNumber() {

            mTasksOnDisplay++;

        }
@@ -981,6 +997,15 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { 
                && mSplitScreenController.isTaskInSplitScreen(taskId);

    }



    private void dump(PrintWriter pw, String prefix) {

        final String innerPrefix = prefix + "  ";

        pw.println(prefix + "DesktopModeWindowDecorViewModel");

        pw.println(innerPrefix + "DesktopModeStatus=" + DesktopModeStatus.isEnabled());

        pw.println(innerPrefix + "mTransitionDragActive=" + mTransitionDragActive);

        pw.println(innerPrefix + "mEventReceiversByDisplay=" + mEventReceiversByDisplay);

        pw.println(innerPrefix + "mWindowDecorByTaskId=" + mWindowDecorByTaskId);

    }



    private class DragStartListenerImpl

            implements DragPositioningCallbackUtility.DragStartListener {

        @Override

libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecoration.java

+12 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.wm.shell.windowdecor; 


import static android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM;

import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN;

import static android.app.WindowConfiguration.windowingModeToString;



import android.app.ActivityManager;

import android.app.WindowConfiguration.WindowingMode;
@@ -661,6 +662,17 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin 
        mRelayoutBlock++;

    }



    @Override

    public String toString() {

        return "{"

                + "mPositionInParent=" + mPositionInParent + ", "

                + "mRelayoutBlock=" + mRelayoutBlock + ", "

                + "taskId=" + mTaskInfo.taskId + ", "

                + "windowingMode=" + windowingModeToString(mTaskInfo.getWindowingMode()) + ", "

                + "isFocused=" + isFocused()

                + "}";

    }



    static class Factory {



        DesktopModeWindowDecoration create(

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorViewModelTests.kt

+3 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ import com.android.wm.shell.desktopmode.DesktopTasksController 
import com.android.wm.shell.recents.RecentsTransitionHandler

import com.android.wm.shell.recents.RecentsTransitionStateListener

import com.android.wm.shell.sysui.KeyguardChangeListener

import com.android.wm.shell.sysui.ShellCommandHandler

import com.android.wm.shell.sysui.ShellController

import com.android.wm.shell.sysui.ShellInit

import com.android.wm.shell.transition.Transitions
@@ -89,6 +90,7 @@ class DesktopModeWindowDecorViewModelTests : ShellTestCase() { 
    @Mock private lateinit var mockShellExecutor: ShellExecutor

    @Mock private lateinit var mockRootTaskDisplayAreaOrganizer: RootTaskDisplayAreaOrganizer

    @Mock private lateinit var mockRecentsTransitionHandler: RecentsTransitionHandler

    @Mock private lateinit var mockShellCommandHandler: ShellCommandHandler



    private val transactionFactory = Supplier<SurfaceControl.Transaction> {

        SurfaceControl.Transaction()
@@ -105,6 +107,7 @@ class DesktopModeWindowDecorViewModelTests : ShellTestCase() { 
                mockMainHandler,

                mockMainChoreographer,

                shellInit,

                mockShellCommandHandler,

                mockTaskOrganizer,

                mockDisplayController,

                mockShellController,