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

Commit ad753ce2 authored by Eric Lin's avatar Eric Lin Committed by Android (Google) Code Review
Browse files

Merge "Improve TaskListener logging for clarity." into main

parents 734d1df6 53f5bb34

libs/WindowManager/Shell/src/com/android/wm/shell/fullscreen/FullscreenTaskListener.java

+1 −2
Original line number Original line Diff line number Diff line
@@ -17,7 +17,6 @@ 
package com.android.wm.shell.fullscreen;

package com.android.wm.shell.fullscreen;





import static com.android.wm.shell.ShellTaskOrganizer.TASK_LISTENER_TYPE_FULLSCREEN;

import static com.android.wm.shell.ShellTaskOrganizer.TASK_LISTENER_TYPE_FULLSCREEN;

import static com.android.wm.shell.ShellTaskOrganizer.taskListenerTypeToString;





import android.app.ActivityManager;

import android.app.ActivityManager;

import android.app.ActivityManager.RunningTaskInfo;

import android.app.ActivityManager.RunningTaskInfo;
@@ -177,6 +176,6 @@ public class FullscreenTaskListener implements ShellTaskOrganizer.TaskListener { 




    @Override

    @Override

    public String toString() {

    public String toString() {

        return TAG + ":" + taskListenerTypeToString(TASK_LISTENER_TYPE_FULLSCREEN);

        return TAG;

    }

    }

}
 
}

libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageTaskListener.java

+7 −6
Original line number Original line Diff line number Diff line
@@ -17,7 +17,6 @@ 
package com.android.wm.shell.splitscreen;

package com.android.wm.shell.splitscreen;





import static android.app.ActivityTaskManager.INVALID_TASK_ID;

import static android.app.ActivityTaskManager.INVALID_TASK_ID;

import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN;

import static android.app.WindowConfiguration.WINDOWING_MODE_MULTI_WINDOW;

import static android.app.WindowConfiguration.WINDOWING_MODE_MULTI_WINDOW;

import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED;

import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED;

import static android.content.res.Configuration.SCREEN_HEIGHT_DP_UNDEFINED;

import static android.content.res.Configuration.SCREEN_HEIGHT_DP_UNDEFINED;
@@ -583,11 +582,13 @@ public class StageTaskListener implements ShellTaskOrganizer.TaskListener { 




    @Override

    @Override

    public String toString() {

    public String toString() {

        return "mId: " + stageTypeToString(mId)

        return TAG + "("

                + " mVisible: " + mVisible

                + "mId=" + stageTypeToString(mId) + ", "

                + " mActive: " + mIsActive

                + "mVisible=" + mVisible + ", "

                + " mHasRootTask: " + mHasRootTask

                + "mActive=" + mIsActive + ", "

                + " childSize: " + mChildrenTaskInfo.size();

                + "mHasRootTask=" + mHasRootTask + ", "

                + "childSize=" + mChildrenTaskInfo.size()

                + ")";

    }

    }





    @Override

    @Override