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

Commit 12fb8ad3 authored by Merissa Mitchell's avatar Merissa Mitchell Committed by Android (Google) Code Review
Browse files

Merge "Add full-width caption on Shell." into tm-qpr-dev

parents ce6df7e1 23a9bc99

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

0 → 100644
+22 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2023 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.

  -->

<shape android:shape="rectangle"

       android:tintMode="multiply"

       android:tint="@color/decor_title_color"

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

    <solid android:color="@android:color/white" />

</shape>

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

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

  -->

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

        android:width="24dp"

        android:height="24dp"

        android:viewportWidth="24"

        android:viewportHeight="24"

        android:width="32.0dp"

        android:height="32.0dp"

        android:viewportWidth="32.0"

        android:viewportHeight="32.0"

        android:tint="@color/decor_button_dark_color">

    <path

        android:fillColor="@android:color/white" android:pathData="M6,21V19H18V21Z"/>

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

0 → 100644
+56 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2023 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.

  -->

<com.android.wm.shell.windowdecor.WindowDecorLinearLayout

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

    android:id="@+id/caption"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:gravity="end"

    android:background="@drawable/caption_decor_title">

    <Button

        style="@style/CaptionButtonStyle"

        android:id="@+id/back_button"

        android:layout_gravity="center_vertical|end"

        android:contentDescription="@string/back_button_text"

        android:background="@drawable/decor_back_button_dark"

        android:duplicateParentState="true"/>

    <Space

        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:layout_weight="1"

        android:elevation="2dp"/>

    <Button

        style="@style/CaptionButtonStyle"

        android:id="@+id/minimize_window"

        android:layout_gravity="center_vertical|end"

        android:contentDescription="@string/minimize_button_text"

        android:background="@drawable/decor_minimize_button_dark"

        android:duplicateParentState="true"/>

    <Button

        style="@style/CaptionButtonStyle"

        android:id="@+id/maximize_window"

        android:layout_gravity="center_vertical|end"

        android:contentDescription="@string/maximize_button_text"

        android:background="@drawable/decor_maximize_button_dark"

        android:duplicateParentState="true"/>

    <Button

        style="@style/CaptionButtonStyle"

        android:id="@+id/close_window"

        android:contentDescription="@string/close_button_text"

        android:background="@drawable/decor_close_button_dark"

        android:duplicateParentState="true"/>

</com.android.wm.shell.windowdecor.WindowDecorLinearLayout>
 
 No newline at end of file

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

+12 −1
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ import com.android.wm.shell.common.TransactionPool; 
import com.android.wm.shell.common.annotations.ShellBackgroundThread;

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

import com.android.wm.shell.desktopmode.DesktopModeController;

import com.android.wm.shell.desktopmode.DesktopModeStatus;

import com.android.wm.shell.desktopmode.DesktopModeTaskRepository;

import com.android.wm.shell.desktopmode.DesktopTasksController;

import com.android.wm.shell.draganddrop.DragAndDropController;
@@ -93,6 +94,7 @@ import com.android.wm.shell.unfold.animation.SplitTaskUnfoldAnimator; 
import com.android.wm.shell.unfold.animation.UnfoldTaskAnimator;

import com.android.wm.shell.unfold.qualifier.UnfoldShellTransition;

import com.android.wm.shell.unfold.qualifier.UnfoldTransition;

import com.android.wm.shell.windowdecor.CaptionWindowDecorViewModel;

import com.android.wm.shell.windowdecor.DesktopModeWindowDecorViewModel;

import com.android.wm.shell.windowdecor.WindowDecorViewModel;
@@ -192,6 +194,7 @@ public abstract class WMShellModule { 
            SyncTransactionQueue syncQueue,

            Optional<DesktopModeController> desktopModeController,

            Optional<DesktopTasksController> desktopTasksController) {

        if (DesktopModeStatus.isAnyEnabled()) {

            return new DesktopModeWindowDecorViewModel(

                    context,

                    mainHandler,
@@ -202,6 +205,14 @@ public abstract class WMShellModule { 
                    desktopModeController,

                    desktopTasksController);

        }

        return new CaptionWindowDecorViewModel(

                    context,

                    mainHandler,

                    mainChoreographer,

                    taskOrganizer,

                    displayController,

                    syncQueue);

    }



    //

    // Freeform

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

0 → 100644
+266 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2023 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.

 */



package com.android.wm.shell.windowdecor;



import static android.app.WindowConfiguration.ACTIVITY_TYPE_STANDARD;

import static android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM;

import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN;



import android.app.ActivityManager.RunningTaskInfo;

import android.content.Context;

import android.os.Handler;

import android.util.SparseArray;

import android.view.Choreographer;

import android.view.MotionEvent;

import android.view.SurfaceControl;

import android.view.View;

import android.window.WindowContainerToken;

import android.window.WindowContainerTransaction;



import com.android.wm.shell.R;

import com.android.wm.shell.ShellTaskOrganizer;

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

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

import com.android.wm.shell.freeform.FreeformTaskTransitionStarter;



/**

 * View model for the window decoration with a caption and shadows. Works with

 * {@link CaptionWindowDecoration}.

 */

public class CaptionWindowDecorViewModel implements WindowDecorViewModel {

    private final ShellTaskOrganizer mTaskOrganizer;

    private final Context mContext;

    private final Handler mMainHandler;

    private final Choreographer mMainChoreographer;

    private final DisplayController mDisplayController;

    private final SyncTransactionQueue mSyncQueue;

    private TaskOperations mTaskOperations;



    private final SparseArray<CaptionWindowDecoration> mWindowDecorByTaskId = new SparseArray<>();



    public CaptionWindowDecorViewModel(

            Context context,

            Handler mainHandler,

            Choreographer mainChoreographer,

            ShellTaskOrganizer taskOrganizer,

            DisplayController displayController,

            SyncTransactionQueue syncQueue) {

        mContext = context;

        mMainHandler = mainHandler;

        mMainChoreographer = mainChoreographer;

        mTaskOrganizer = taskOrganizer;

        mDisplayController = displayController;

        mSyncQueue = syncQueue;

    }



    @Override

    public void setFreeformTaskTransitionStarter(FreeformTaskTransitionStarter transitionStarter) {

        mTaskOperations = new TaskOperations(transitionStarter, mContext, mSyncQueue);

    }



    @Override

    public boolean onTaskOpening(

            RunningTaskInfo taskInfo,

            SurfaceControl taskSurface,

            SurfaceControl.Transaction startT,

            SurfaceControl.Transaction finishT) {

        if (!shouldShowWindowDecor(taskInfo)) return false;

        createWindowDecoration(taskInfo, taskSurface, startT, finishT);

        return true;

    }



    @Override

    public void onTaskInfoChanged(RunningTaskInfo taskInfo) {

        final CaptionWindowDecoration decoration = mWindowDecorByTaskId.get(taskInfo.taskId);



        if (decoration == null) return;



        decoration.relayout(taskInfo);

        setupCaptionColor(taskInfo, decoration);

    }



    @Override

    public void onTaskChanging(

            RunningTaskInfo taskInfo,

            SurfaceControl taskSurface,

            SurfaceControl.Transaction startT,

            SurfaceControl.Transaction finishT) {

        final CaptionWindowDecoration decoration = mWindowDecorByTaskId.get(taskInfo.taskId);



        if (!shouldShowWindowDecor(taskInfo)) {

            if (decoration != null) {

                destroyWindowDecoration(taskInfo);

            }

            return;

        }



        if (decoration == null) {

            createWindowDecoration(taskInfo, taskSurface, startT, finishT);

        } else {

            decoration.relayout(taskInfo, startT, finishT);

        }

    }



    @Override

    public void onTaskClosing(

            RunningTaskInfo taskInfo,

            SurfaceControl.Transaction startT,

            SurfaceControl.Transaction finishT) {

        final CaptionWindowDecoration decoration = mWindowDecorByTaskId.get(taskInfo.taskId);

        if (decoration == null) return;



        decoration.relayout(taskInfo, startT, finishT);

    }



    @Override

    public void destroyWindowDecoration(RunningTaskInfo taskInfo) {

        final CaptionWindowDecoration decoration =

                mWindowDecorByTaskId.removeReturnOld(taskInfo.taskId);

        if (decoration == null) return;



        decoration.close();

    }



    private void setupCaptionColor(RunningTaskInfo taskInfo, CaptionWindowDecoration decoration) {

        int statusBarColor = taskInfo.taskDescription.getStatusBarColor();

        decoration.setCaptionColor(statusBarColor);

    }



    private boolean shouldShowWindowDecor(RunningTaskInfo taskInfo) {

        return taskInfo.getWindowingMode() == WINDOWING_MODE_FREEFORM

                || (taskInfo.getActivityType() == ACTIVITY_TYPE_STANDARD

                    && taskInfo.configuration.windowConfiguration.getDisplayWindowingMode()

                        == WINDOWING_MODE_FREEFORM);

    }



    private void createWindowDecoration(

            RunningTaskInfo taskInfo,

            SurfaceControl taskSurface,

            SurfaceControl.Transaction startT,

            SurfaceControl.Transaction finishT) {

        CaptionWindowDecoration oldDecoration = mWindowDecorByTaskId.get(taskInfo.taskId);

        if (oldDecoration != null) {

            // close the old decoration if it exists to avoid two window decorations being added

            oldDecoration.close();

        }

        final CaptionWindowDecoration windowDecoration =

                new CaptionWindowDecoration(

                        mContext,

                        mDisplayController,

                        mTaskOrganizer,

                        taskInfo,

                        taskSurface,

                        mMainHandler,

                        mMainChoreographer,

                        mSyncQueue);

        mWindowDecorByTaskId.put(taskInfo.taskId, windowDecoration);



        TaskPositioner taskPositioner =

                new TaskPositioner(mTaskOrganizer, windowDecoration);

        CaptionTouchEventListener touchEventListener =

                new CaptionTouchEventListener(taskInfo, taskPositioner);

        windowDecoration.setCaptionListeners(touchEventListener, touchEventListener);

        windowDecoration.setDragResizeCallback(taskPositioner);

        windowDecoration.relayout(taskInfo, startT, finishT);

        setupCaptionColor(taskInfo, windowDecoration);

    }



    private class CaptionTouchEventListener implements

            View.OnClickListener, View.OnTouchListener {



        private final int mTaskId;

        private final WindowContainerToken mTaskToken;

        private final DragResizeCallback mDragResizeCallback;



        private int mDragPointerId = -1;



        private CaptionTouchEventListener(

                RunningTaskInfo taskInfo,

                DragResizeCallback dragResizeCallback) {

            mTaskId = taskInfo.taskId;

            mTaskToken = taskInfo.token;

            mDragResizeCallback = dragResizeCallback;

        }



        @Override

        public void onClick(View v) {

            final int id = v.getId();

            if (id == R.id.close_window) {

                mTaskOperations.closeTask(mTaskToken);

            } else if (id == R.id.back_button) {

                mTaskOperations.injectBackKey();

            } else if (id == R.id.minimize_window) {

                mTaskOperations.minimizeTask(mTaskToken);

            } else if (id == R.id.maximize_window) {

                RunningTaskInfo taskInfo = mTaskOrganizer.getRunningTaskInfo(mTaskId);

                mTaskOperations.maximizeTask(taskInfo);

            }

        }



        @Override

        public boolean onTouch(View v, MotionEvent e) {

            if (v.getId() != R.id.caption) {

                return false;

            }

            handleEventForMove(e);



            if (e.getAction() != MotionEvent.ACTION_DOWN) {

                return false;

            }

            RunningTaskInfo taskInfo = mTaskOrganizer.getRunningTaskInfo(mTaskId);

            if (taskInfo.isFocused) {

                return false;

            }

            WindowContainerTransaction wct = new WindowContainerTransaction();

            wct.reorder(mTaskToken, true /* onTop */);

            mSyncQueue.queue(wct);

            return true;

        }



        /**

         * @param e {@link MotionEvent} to process

         * @return {@code true} if a drag is happening; or {@code false} if it is not

         */

        private void handleEventForMove(MotionEvent e) {

            RunningTaskInfo taskInfo = mTaskOrganizer.getRunningTaskInfo(mTaskId);

            if (taskInfo.getWindowingMode() == WINDOWING_MODE_FULLSCREEN) {

                return;

            }

            switch (e.getActionMasked()) {

                case MotionEvent.ACTION_DOWN: {

                    mDragPointerId = e.getPointerId(0);

                    mDragResizeCallback.onDragResizeStart(

                            0 /* ctrlType */, e.getRawX(0), e.getRawY(0));

                    break;

                }

                case MotionEvent.ACTION_MOVE: {

                    int dragPointerIdx = e.findPointerIndex(mDragPointerId);

                    mDragResizeCallback.onDragResizeMove(

                            e.getRawX(dragPointerIdx), e.getRawY(dragPointerIdx));

                    break;

                }

                case MotionEvent.ACTION_UP:

                case MotionEvent.ACTION_CANCEL: {

                    int dragPointerIdx = e.findPointerIndex(mDragPointerId);

                    mDragResizeCallback.onDragResizeEnd(

                            e.getRawX(dragPointerIdx), e.getRawY(dragPointerIdx));

                    break;

                }

            }

        }

    }

}