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

Commit 062b17a1 authored by Wale Ogunwale's avatar Wale Ogunwale
Browse files

Rename splitscreen package to legacysplitscreen 

Split-screen implementations moving forward would be based on app-pairs
and main/side stage models. So, renaming existing package to avoid
confusion.

Bug: 175416931
Test: They pass!
Change-Id: I55ab1d27fb1c00ba7a58d685ea7eb2840efb9437
parent f010d5de

libs/WindowManager/Shell/res/layout/docked_stack_divider.xml

+4 −4
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
     limitations under the License.

-->



<com.android.wm.shell.splitscreen.DividerView

<com.android.wm.shell.legacysplitscreen.DividerView

        xmlns:android="http://schemas.android.com/apk/res/android"

        android:layout_height="match_parent"

        android:layout_width="match_parent">
@@ -24,15 +24,15 @@ 
        android:id="@+id/docked_divider_background"

        android:background="@color/docked_divider_background"/>



    <com.android.wm.shell.splitscreen.MinimizedDockShadow

    <com.android.wm.shell.legacysplitscreen.MinimizedDockShadow

        style="@style/DockedDividerMinimizedShadow"

        android:id="@+id/minimized_dock_shadow"

        android:alpha="0"/>">



    <com.android.wm.shell.splitscreen.DividerHandleView

    <com.android.wm.shell.legacysplitscreen.DividerHandleView

        style="@style/DockedDividerHandle"

        android:id="@+id/docked_divider_handle"

        android:contentDescription="@string/accessibility_divider"

        android:background="@null"/>



</com.android.wm.shell.splitscreen.DividerView>
 
</com.android.wm.shell.legacysplitscreen.DividerView>

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

+21 −39
Original line number Diff line number Diff line 
{

  "version": "1.0.0",

  "messages": {

    "-1993693214": {

      "message": "Letterbox Task Changed: #%d",

      "level": "VERBOSE",

      "group": "WM_SHELL_TASK_ORG",

      "at": "com\/android\/wm\/shell\/letterbox\/LetterboxTaskListener.java"

    },

    "-1683614271": {

      "message": "Existing task: id=%d component=%s",

      "level": "VERBOSE",
@@ -37,6 +31,12 @@ 
      "group": "WM_SHELL_DRAG_AND_DROP",

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

    },

    "-1362429294": {

      "message": "%s onTaskAppeared Primary taskId=%d",

      "level": "VERBOSE",

      "group": "WM_SHELL_TASK_ORG",

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

    },

    "-1340279385": {

      "message": "Remove listener=%s",

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

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

    },

    "-842742255": {

      "message": "%s onTaskAppeared unknown taskId=%d winMode=%d",

      "level": "VERBOSE",

      "group": "WM_SHELL_TASK_ORG",

      "at": "com\/android\/wm\/shell\/splitscreen\/SplitScreenTaskListener.java"

    },

    "-742394458": {

      "message": "pair task1=%d task2=%d in AppPair=%s",

      "level": "VERBOSE",
@@ -91,17 +85,11 @@ 
      "group": "WM_SHELL_DRAG_AND_DROP",

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

    },

    "-679492476": {

      "message": "%s onTaskAppeared Primary taskId=%d",

      "level": "VERBOSE",

      "group": "WM_SHELL_TASK_ORG",

      "at": "com\/android\/wm\/shell\/splitscreen\/SplitScreenTaskListener.java"

    },

    "-342975160": {

      "message": "Letterbox Task Vanished: #%d",

    "-298656957": {

      "message": "%s onTaskAppeared unknown taskId=%d winMode=%d",

      "level": "VERBOSE",

      "group": "WM_SHELL_TASK_ORG",

      "at": "com\/android\/wm\/shell\/letterbox\/LetterboxTaskListener.java"

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

    },

    "-234284913": {

      "message": "unpair taskId=%d pair=%s",
@@ -115,12 +103,6 @@ 
      "group": "WM_SHELL_TRANSITIONS",

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

    },

    "154313206": {

      "message": "%s onTaskAppeared Secondary taskId=%d",

      "level": "VERBOSE",

      "group": "WM_SHELL_TASK_ORG",

      "at": "com\/android\/wm\/shell\/splitscreen\/SplitScreenTaskListener.java"

    },

    "157713005": {

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

      "level": "VERBOSE",
@@ -139,6 +121,12 @@ 
      "group": "WM_SHELL_DRAG_AND_DROP",

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

    },

    "473543554": {

      "message": "%s onTaskAppeared Supported",

      "level": "VERBOSE",

      "group": "WM_SHELL_TASK_ORG",

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

    },

    "481673835": {

      "message": "addListenerForTaskId taskId=%s",

      "level": "VERBOSE",
@@ -175,6 +163,12 @@ 
      "group": "WM_SHELL_TASK_ORG",

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

    },

    "982027396": {

      "message": "%s onTaskAppeared Secondary taskId=%d",

      "level": "VERBOSE",

      "group": "WM_SHELL_TASK_ORG",

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

    },

    "1079041527": {

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

      "level": "VERBOSE",
@@ -199,12 +193,6 @@ 
      "group": "WM_SHELL_DRAG_AND_DROP",

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

    },

    "1885882094": {

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

      "level": "VERBOSE",

      "group": "WM_SHELL_TASK_ORG",

      "at": "com\/android\/wm\/shell\/letterbox\/LetterboxTaskListener.java"

    },

    "1891981945": {

      "message": "release entry.taskId=%s listener=%s size=%d",

      "level": "VERBOSE",
@@ -228,12 +216,6 @@ 
      "level": "VERBOSE",

      "group": "WM_SHELL_DRAG_AND_DROP",

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

    },

    "2135461748": {

      "message": "%s onTaskAppeared Supported",

      "level": "VERBOSE",

      "group": "WM_SHELL_TASK_ORG",

      "at": "com\/android\/wm\/shell\/splitscreen\/SplitScreenTaskListener.java"

    }

  },

  "groups": {

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

+5 −5
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ import com.android.wm.shell.common.annotations.ExternalThread; 
import com.android.wm.shell.hidedisplaycutout.HideDisplayCutout;

import com.android.wm.shell.onehanded.OneHanded;

import com.android.wm.shell.pip.Pip;

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

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



import java.io.PrintWriter;

import java.util.Optional;
@@ -33,7 +33,7 @@ import java.util.Optional; 
 */

public final class ShellCommandHandler {



    private final Optional<SplitScreen> mSplitScreenOptional;

    private final Optional<LegacySplitScreen> mLegacySplitScreenOptional;

    private final Optional<Pip> mPipOptional;

    private final Optional<OneHanded> mOneHandedOptional;

    private final Optional<HideDisplayCutout> mHideDisplayCutout;
@@ -42,13 +42,13 @@ public final class ShellCommandHandler { 


    public ShellCommandHandler(

            ShellTaskOrganizer shellTaskOrganizer,

            Optional<SplitScreen> splitScreenOptional,

            Optional<LegacySplitScreen> legacySplitScreenOptional,

            Optional<Pip> pipOptional,

            Optional<OneHanded> oneHandedOptional,

            Optional<HideDisplayCutout> hideDisplayCutout,

            Optional<AppPairs> appPairsOptional) {

        mShellTaskOrganizer = shellTaskOrganizer;

        mSplitScreenOptional = splitScreenOptional;

        mLegacySplitScreenOptional = legacySplitScreenOptional;

        mPipOptional = pipOptional;

        mOneHandedOptional = oneHandedOptional;

        mHideDisplayCutout = hideDisplayCutout;
@@ -62,7 +62,7 @@ public final class ShellCommandHandler { 
        pw.println();

        pw.println();

        mPipOptional.ifPresent(pip -> pip.dump(pw));

        mSplitScreenOptional.ifPresent(splitScreen -> splitScreen.dump(pw));

        mLegacySplitScreenOptional.ifPresent(splitScreen -> splitScreen.dump(pw));

        mOneHandedOptional.ifPresent(oneHanded -> oneHanded.dump(pw));

        mHideDisplayCutout.ifPresent(hideDisplayCutout -> hideDisplayCutout.dump(pw));

        pw.println();

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

+5 −5
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ import com.android.wm.shell.apppairs.AppPairs; 
import com.android.wm.shell.common.DisplayImeController;

import com.android.wm.shell.common.annotations.ExternalThread;

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

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

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



import java.util.Optional;
@@ -34,7 +34,7 @@ public class ShellInit { 
    private final DisplayImeController mDisplayImeController;

    private final DragAndDropController mDragAndDropController;

    private final ShellTaskOrganizer mShellTaskOrganizer;

    private final Optional<SplitScreen> mSplitScreenOptional;

    private final Optional<LegacySplitScreen> mLegacySplitScreenOptional;

    private final Optional<AppPairs> mAppPairsOptional;

    private final FullscreenTaskListener mFullscreenTaskListener;

    private final Transitions mTransitions;
@@ -42,14 +42,14 @@ public class ShellInit { 
    public ShellInit(DisplayImeController displayImeController,

            DragAndDropController dragAndDropController,

            ShellTaskOrganizer shellTaskOrganizer,

            Optional<SplitScreen> splitScreenOptional,

            Optional<LegacySplitScreen> legacySplitScreenOptional,

            Optional<AppPairs> appPairsOptional,

            FullscreenTaskListener fullscreenTaskListener,

            Transitions transitions) {

        mDisplayImeController = displayImeController;

        mDragAndDropController = dragAndDropController;

        mShellTaskOrganizer = shellTaskOrganizer;

        mSplitScreenOptional = splitScreenOptional;

        mLegacySplitScreenOptional = legacySplitScreenOptional;

        mAppPairsOptional = appPairsOptional;

        mFullscreenTaskListener = fullscreenTaskListener;

        mTransitions = transitions;
@@ -67,7 +67,7 @@ public class ShellInit { 


        mAppPairsOptional.ifPresent(AppPairs::onOrganizerRegistered);

        // Bind the splitscreen impl to the drag drop controller

        mDragAndDropController.setSplitScreenController(mSplitScreenOptional);

        mDragAndDropController.setSplitScreenController(mLegacySplitScreenOptional);



        if (Transitions.ENABLE_SHELL_TRANSITIONS) {

            mTransitions.register(mShellTaskOrganizer);

libs/WindowManager/Shell/src/com/android/wm/shell/draganddrop/DragAndDropController.java

+5 −5
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ import com.android.internal.protolog.common.ProtoLog; 
import com.android.wm.shell.R;

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

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

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

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



import java.util.Optional;
@@ -66,7 +66,7 @@ public class DragAndDropController implements DisplayController.OnDisplaysChange 


    private final Context mContext;

    private final DisplayController mDisplayController;

    private SplitScreen mSplitScreen;

    private LegacySplitScreen mLegacySplitScreen;



    private final SparseArray<PerDisplay> mDisplayDropTargets = new SparseArray<>();

    private final SurfaceControl.Transaction mTransaction = new SurfaceControl.Transaction();
@@ -77,8 +77,8 @@ public class DragAndDropController implements DisplayController.OnDisplaysChange 
        mDisplayController.addDisplayWindowListener(this);

    }



    public void setSplitScreenController(Optional<SplitScreen> splitscreen) {

        mSplitScreen = splitscreen.orElse(null);

    public void setSplitScreenController(Optional<LegacySplitScreen> splitscreen) {

        mLegacySplitScreen = splitscreen.orElse(null);

    }



    @Override
@@ -104,7 +104,7 @@ public class DragAndDropController implements DisplayController.OnDisplaysChange 
                R.layout.global_drop_target, null);

        rootView.setOnDragListener(this);

        rootView.setVisibility(View.INVISIBLE);

        DragLayout dragLayout = new DragLayout(context, mSplitScreen);

        DragLayout dragLayout = new DragLayout(context, mLegacySplitScreen);

        rootView.addView(dragLayout,

                new FrameLayout.LayoutParams(MATCH_PARENT, MATCH_PARENT));

        try {