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

Commit 57000adf authored by Evan Rosky's avatar Evan Rosky
Browse files

Move shell Transitions into a package 

For organization.

Bug: 169035082
Test: builds/runs (no logic changed)
Change-Id: I224ab5f19df7ce49a2112dcf7c900a3fc310532d
parent 19d37240

libs/WindowManager/Shell/res/raw/wm_shell_protolog.json

+18 −18
Original line number Diff line number Diff line
@@ -7,24 +7,12 @@ 
      "group": "WM_SHELL_TASK_ORG",

      "at": "com\/android\/wm\/shell\/ShellTaskOrganizer.java"

    },

    "-1534364071": {

      "message": "onTransitionReady %s: %s",

      "level": "VERBOSE",

      "group": "WM_SHELL_TRANSITIONS",

      "at": "com\/android\/wm\/shell\/Transitions.java"

    },

    "-1501874464": {

      "message": "Fullscreen Task Appeared: #%d",

      "level": "VERBOSE",

      "group": "WM_SHELL_TASK_ORG",

      "at": "com\/android\/wm\/shell\/FullscreenTaskListener.java"

    },

    "-1480787369": {

      "message": "Transition requested: type=%d %s",

      "level": "VERBOSE",

      "group": "WM_SHELL_TRANSITIONS",

      "at": "com\/android\/wm\/shell\/Transitions.java"

    },

    "-1382704050": {

      "message": "Display removed: %d",

      "level": "VERBOSE",
@@ -97,12 +85,6 @@ 
      "group": "WM_SHELL_TASK_ORG",

      "at": "com\/android\/wm\/shell\/apppairs\/AppPairsController.java"

    },

    "-191422040": {

      "message": "Transition animations finished, notifying core %s",

      "level": "VERBOSE",

      "group": "WM_SHELL_TRANSITIONS",

      "at": "com\/android\/wm\/shell\/Transitions.java"

    },

    "157713005": {

      "message": "Task info changed taskId=%d",

      "level": "VERBOSE",
@@ -115,6 +97,12 @@ 
      "group": "WM_SHELL_DRAG_AND_DROP",

      "at": "com\/android\/wm\/shell\/draganddrop\/DropOutlineDrawable.java"

    },

    "325110414": {

      "message": "Transition animations finished, notifying core %s",

      "level": "VERBOSE",

      "group": "WM_SHELL_TRANSITIONS",

      "at": "com\/android\/wm\/shell\/transition\/Transitions.java"

    },

    "375908576": {

      "message": "Clip description: handlingDrag=%b itemCount=%d mimeTypes=%s",

      "level": "VERBOSE",
@@ -145,6 +133,12 @@ 
      "group": "WM_SHELL_TASK_ORG",

      "at": "com\/android\/wm\/shell\/ShellTaskOrganizer.java"

    },

    "846958769": {

      "message": "Transition requested: type=%d %s",

      "level": "VERBOSE",

      "group": "WM_SHELL_TRANSITIONS",

      "at": "com\/android\/wm\/shell\/transition\/Transitions.java"

    },

    "900599280": {

      "message": "Can't pair unresizeable tasks task1.isResizeable=%b task1.isResizeable=%b",

      "level": "ERROR",
@@ -169,6 +163,12 @@ 
      "group": "WM_SHELL_TASK_ORG",

      "at": "com\/android\/wm\/shell\/legacysplitscreen\/LegacySplitScreenTaskListener.java"

    },

    "1070270131": {

      "message": "onTransitionReady %s: %s",

      "level": "VERBOSE",

      "group": "WM_SHELL_TRANSITIONS",

      "at": "com\/android\/wm\/shell\/transition\/Transitions.java"

    },

    "1079041527": {

      "message": "incrementPool size=%d",

      "level": "VERBOSE",

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

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import androidx.annotation.NonNull; 
import com.android.internal.protolog.common.ProtoLog;

import com.android.wm.shell.common.SyncTransactionQueue;

import com.android.wm.shell.protolog.ShellProtoLogGroup;

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



import java.io.PrintWriter;

libs/WindowManager/Shell/src/com/android/wm/shell/ShellInitImpl.java

+10 −1
Original line number Diff line number Diff line
@@ -24,9 +24,9 @@ import com.android.wm.shell.common.ShellExecutor; 
import com.android.wm.shell.common.annotations.ExternalThread;

import com.android.wm.shell.draganddrop.DragAndDropController;

import com.android.wm.shell.legacysplitscreen.LegacySplitScreen;

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



import java.util.Optional;

import java.util.concurrent.TimeUnit;



/**

 * The entry point implementation into the shell for initializing shell internal state.
@@ -41,6 +41,7 @@ public class ShellInitImpl { 
    private final Optional<AppPairs> mAppPairsOptional;

    private final FullscreenTaskListener mFullscreenTaskListener;

    private final ShellExecutor mMainExecutor;

    private final Transitions mTransitions;



    private final InitImpl mImpl = new InitImpl();
@@ -50,6 +51,7 @@ public class ShellInitImpl { 
            Optional<LegacySplitScreen> legacySplitScreenOptional,

            Optional<AppPairs> appPairsOptional,

            FullscreenTaskListener fullscreenTaskListener,

            Transitions transitions,

            ShellExecutor mainExecutor) {

        return new ShellInitImpl(displayImeController,

                dragAndDropController,
@@ -57,6 +59,7 @@ public class ShellInitImpl { 
                legacySplitScreenOptional,

                appPairsOptional,

                fullscreenTaskListener,

                transitions,

                mainExecutor).mImpl;

    }
@@ -66,6 +69,7 @@ public class ShellInitImpl { 
            Optional<LegacySplitScreen> legacySplitScreenOptional,

            Optional<AppPairs> appPairsOptional,

            FullscreenTaskListener fullscreenTaskListener,

            Transitions transitions,

            ShellExecutor mainExecutor) {

        mDisplayImeController = displayImeController;

        mDragAndDropController = dragAndDropController;
@@ -73,6 +77,7 @@ public class ShellInitImpl { 
        mLegacySplitScreenOptional = legacySplitScreenOptional;

        mAppPairsOptional = appPairsOptional;

        mFullscreenTaskListener = fullscreenTaskListener;

        mTransitions = transitions;

        mMainExecutor = mainExecutor;

    }
@@ -89,6 +94,10 @@ public class ShellInitImpl { 


        // Bind the splitscreen impl to the drag drop controller

        mDragAndDropController.initialize(mLegacySplitScreenOptional);



        if (Transitions.ENABLE_SHELL_TRANSITIONS) {

            mTransitions.register(mShellTaskOrganizer);

        }

    }



    @ExternalThread

libs/WindowManager/Shell/src/com/android/wm/shell/legacysplitscreen/LegacySplitScreenController.java

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ import android.window.WindowContainerTransaction; 
import com.android.internal.policy.DividerSnapAlgorithm;

import com.android.wm.shell.R;

import com.android.wm.shell.ShellTaskOrganizer;

import com.android.wm.shell.Transitions;

import com.android.wm.shell.common.DisplayChangeController;

import com.android.wm.shell.common.DisplayController;

import com.android.wm.shell.common.DisplayImeController;
@@ -54,6 +53,7 @@ import com.android.wm.shell.common.SystemWindows; 
import com.android.wm.shell.common.TaskStackListenerCallback;

import com.android.wm.shell.common.TaskStackListenerImpl;

import com.android.wm.shell.common.TransactionPool;

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



import java.io.PrintWriter;

import java.lang.ref.WeakReference;

libs/WindowManager/Shell/src/com/android/wm/shell/legacysplitscreen/LegacySplitScreenTaskListener.java

+1 −1
Original line number Diff line number Diff line
@@ -38,8 +38,8 @@ import androidx.annotation.NonNull; 


import com.android.internal.protolog.common.ProtoLog;

import com.android.wm.shell.ShellTaskOrganizer;

import com.android.wm.shell.Transitions;

import com.android.wm.shell.common.SyncTransactionQueue;

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



import java.io.PrintWriter;

import java.util.ArrayList;