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

Commit 7ab2a40d authored by Ivan Makarov's avatar Ivan Makarov
Browse files

Add TV splitscreen menu 

Add a splitscreen menu for TV allowing to change the focused task, swap
the stages and exit the splitscreen mode by closing one of the stages.

Bug: 242179031
Test: Enter the splitscreen mode. Send the corresponding broadcast to open the menu (adb shell am
   broadcast -a com.android.wm.shell.splitscreen.SHOW_MENU). Choose the needed action button and press it, open the menu again, etc. Press the back button on the
menu control to hide the menu window.

Change-Id: Iac17445414a190c91ccd407d67f0f8c29d6bd4bf
parent 16985df5

libs/WindowManager/Shell/res/drawable/tv_split_menu_ic_focus.xml

0 → 100644
+26 −0
Original line number Diff line number Diff line 
<!--

  ~ Copyright (C) 2022 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  -->



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

    android:width="@dimen/tv_window_menu_icon_size"

    android:height="@dimen/tv_window_menu_icon_size"

    android:viewportWidth="24.0"

    android:viewportHeight="24.0">



    <path

        android:fillColor="#FFFFFF"

        android:pathData="M17,4h3c1.1,0 2,0.9 2,2v2h-2L20,6h-3L17,4zM4,8L4,6h3L7,4L4,4c-1.1,0 -2,0.9 -2,2v2h2zM20,16v2h-3v2h3c1.1,0 2,-0.9 2,-2v-2h-2zM7,18L4,18v-2L2,16v2c0,1.1 0.9,2 2,2h3v-2zM18,8L6,8v8h12L18,8z"/>

</vector>

libs/WindowManager/Shell/res/drawable/tv_split_menu_ic_swap.xml

0 → 100644
+25 −0
Original line number Diff line number Diff line 
<!--

  ~ Copyright (C) 2022 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  -->



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

    android:width="@dimen/tv_window_menu_icon_size"

    android:height="@dimen/tv_window_menu_icon_size"

    android:viewportWidth="24.0"

    android:viewportHeight="24.0">

    <path

        android:fillColor="#FFFFFF"

        android:pathData="M6.99,11L3,15l3.99,4v-3H14v-2H6.99v-3zM21,9l-3.99,-4v3H10v2h7.01v3L21,9z"/>

</vector>
 
 No newline at end of file

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

0 → 100644
+125 −0
Original line number Diff line number Diff line 
<!--

  ~ Copyright (C) 2022 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  -->

<!-- Layout for TvSplitMenuView -->

<com.android.wm.shell.splitscreen.tv.TvSplitMenuView

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

    android:layout_height="match_parent"

    android:layout_width="match_parent">



    <LinearLayout

        android:orientation="horizontal"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:gravity="center">



        <LinearLayout

            android:id="@+id/tv_split_main_menu"

            android:layout_width="0dp"

            android:layout_weight="1"

            android:layout_height="match_parent"

            android:orientation="vertical"

            android:gravity="center">



            <Space

                android:layout_width="match_parent"

                android:layout_height="0dp"

                android:layout_weight="1" />



            <LinearLayout

                android:layout_width="match_parent"

                android:layout_height="0dp"

                android:layout_weight="1"

                android:orientation="vertical"

                android:gravity="center">



                <com.android.wm.shell.common.TvWindowMenuActionButton

                    android:id="@+id/tv_split_main_menu_focus_button"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:src="@drawable/tv_split_menu_ic_focus" />



            </LinearLayout>



            <LinearLayout

                android:layout_width="match_parent"

                android:layout_height="0dp"

                android:layout_weight="1"

                android:orientation="vertical"

                android:gravity="center">



                <com.android.wm.shell.common.TvWindowMenuActionButton

                    android:id="@+id/tv_split_main_menu_close_button"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:src="@drawable/pip_ic_close_white" />



            </LinearLayout>



        </LinearLayout>



        <com.android.wm.shell.common.TvWindowMenuActionButton

            android:id="@+id/tv_split_menu_swap_stages"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:src="@drawable/tv_split_menu_ic_swap" />



        <LinearLayout

            android:id="@+id/tv_split_side_menu"

            android:layout_width="0dp"

            android:layout_weight="1"

            android:layout_height="match_parent"

            android:orientation="vertical"

            android:gravity="center">



            <Space

                android:layout_width="match_parent"

                android:layout_height="0dp"

                android:layout_weight="1" />



            <LinearLayout

                android:layout_width="match_parent"

                android:layout_height="0dp"

                android:layout_weight="1"

                android:orientation="vertical"

                android:gravity="center">



                <com.android.wm.shell.common.TvWindowMenuActionButton

                    android:id="@+id/tv_split_side_menu_focus_button"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:src="@drawable/tv_split_menu_ic_focus" />



            </LinearLayout>



            <LinearLayout

                android:layout_width="match_parent"

                android:layout_height="0dp"

                android:layout_weight="1"

                android:orientation="vertical"

                android:gravity="center">



                <com.android.wm.shell.common.TvWindowMenuActionButton

                    android:id="@+id/tv_split_side_menu_close_button"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:src="@drawable/pip_ic_close_white" />



            </LinearLayout>



        </LinearLayout>



    </LinearLayout>

</com.android.wm.shell.splitscreen.tv.TvSplitMenuView>

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

+46 −2
Original line number Diff line number Diff line
@@ -16,16 +16,32 @@ 


package com.android.wm.shell.dagger;



import android.view.IWindowManager;

import android.content.Context;

import android.os.Handler;



import com.android.launcher3.icons.IconProvider;

import com.android.wm.shell.RootTaskDisplayAreaOrganizer;

import com.android.wm.shell.ShellTaskOrganizer;

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

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

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

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

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

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

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

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

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

import com.android.wm.shell.recents.RecentTasksController;

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

import com.android.wm.shell.splitscreen.tv.TvSplitScreenController;

import com.android.wm.shell.startingsurface.StartingWindowTypeAlgorithm;

import com.android.wm.shell.startingsurface.tv.TvStartingWindowTypeAlgorithm;

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 java.util.Optional;



import dagger.Module;

import dagger.Provides;
@@ -50,5 +66,33 @@ public class TvWMShellModule { 
    @DynamicOverride

    static StartingWindowTypeAlgorithm provideStartingWindowTypeAlgorithm() {

        return new TvStartingWindowTypeAlgorithm();

    };

    }



    @WMSingleton

    @Provides

    @DynamicOverride

    static SplitScreenController provideSplitScreenController(Context context,

            ShellInit shellInit,

            ShellCommandHandler shellCommandHandler,

            ShellController shellController,

            ShellTaskOrganizer shellTaskOrganizer,

            SyncTransactionQueue syncQueue,

            RootTaskDisplayAreaOrganizer rootTDAOrganizer,

            DisplayController displayController,

            DisplayImeController displayImeController,

            DisplayInsetsController displayInsetsController,

            DragAndDropController dragAndDropController,

            Transitions transitions,

            TransactionPool transactionPool,

            IconProvider iconProvider,

            Optional<RecentTasksController> recentTasks,

            @ShellMainThread ShellExecutor mainExecutor,

            Handler mainHandler,

            SystemWindows systemWindows) {

        return new TvSplitScreenController(context, shellInit, shellCommandHandler, shellController,

                shellTaskOrganizer, syncQueue, rootTDAOrganizer, displayController,

                displayImeController, displayInsetsController, dragAndDropController, transitions,

                transactionPool, iconProvider, recentTasks, mainExecutor, mainHandler,

                systemWindows);

    }

}

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

+8 −4
Original line number Diff line number Diff line
@@ -213,13 +213,17 @@ public class SplitScreenController implements DragAndDropPolicy.Starter, 
        mShellController.addKeyguardChangeListener(this);

        if (mStageCoordinator == null) {

            // TODO: Multi-display

            mStageCoordinator = new StageCoordinator(mContext, DEFAULT_DISPLAY, mSyncQueue,

            mStageCoordinator = createStageCoordinator();

        }

        mDragAndDropController.setSplitScreenController(this);

    }



    protected StageCoordinator createStageCoordinator() {

        return new StageCoordinator(mContext, DEFAULT_DISPLAY, mSyncQueue,

                mTaskOrganizer, mDisplayController, mDisplayImeController,

                mDisplayInsetsController, mTransitions, mTransactionPool, mLogger,

                mIconProvider, mMainExecutor, mRecentTasksOptional);

    }

        mDragAndDropController.setSplitScreenController(this);

    }



    @Override

    public Context getContext() {