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

Commit 7a58f7d4 authored by Hongwei Wang's avatar Hongwei Wang Committed by Automerger Merge Worker
Browse files

Merge "Update PiP action even if menu is not visible" into sc-dev am: 10488ee5 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14102435

Change-Id: I146fd1f311e270a18359d976fae7f50ef6ee79a1
parents ee272254 10488ee5

libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PhonePipMenuController.java

+10 −20
Original line number Diff line number Diff line
@@ -16,13 +16,9 @@ 


package com.android.wm.shell.pip.phone;



import static android.app.WindowConfiguration.ACTIVITY_TYPE_UNDEFINED;

import static android.app.WindowConfiguration.WINDOWING_MODE_PINNED;

import static android.view.WindowManager.SHELL_ROOT_LAYER_PIP;



import android.annotation.Nullable;

import android.app.ActivityTaskManager;

import android.app.ActivityTaskManager.RootTaskInfo;

import android.app.RemoteAction;

import android.content.Context;

import android.content.pm.ParceledListSlice;
@@ -43,6 +39,7 @@ import android.view.WindowManagerGlobal; 


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

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

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

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

import com.android.wm.shell.pip.PipMediaController.ActionListener;

import com.android.wm.shell.pip.PipMenuController;
@@ -99,6 +96,7 @@ public class PhonePipMenuController implements PipMenuController { 
    private final RectF mTmpSourceRectF = new RectF();

    private final RectF mTmpDestinationRectF = new RectF();

    private final Context mContext;

    private final PipBoundsState mPipBoundsState;

    private final PipMediaController mMediaController;

    private final ShellExecutor mMainExecutor;

    private final Handler mMainHandler;
@@ -134,10 +132,11 @@ public class PhonePipMenuController implements PipMenuController { 
        }

    };



    public PhonePipMenuController(Context context, PipMediaController mediaController,

            SystemWindows systemWindows, ShellExecutor mainExecutor,

            Handler mainHandler) {

    public PhonePipMenuController(Context context, PipBoundsState pipBoundsState,

            PipMediaController mediaController, SystemWindows systemWindows,

            ShellExecutor mainExecutor, Handler mainHandler) {

        mContext = context;

        mPipBoundsState = pipBoundsState;

        mMediaController = mediaController;

        mSystemWindows = systemWindows;

        mMainExecutor = mainExecutor;
@@ -466,20 +465,11 @@ public class PhonePipMenuController implements PipMenuController { 
     * Updates the PiP menu with the best set of actions provided.

     */

    private void updateMenuActions() {

        if (isMenuVisible()) {

            // Fetch the pinned stack bounds

            Rect stackBounds = null;

            try {

                RootTaskInfo pinnedTaskInfo = ActivityTaskManager.getService().getRootTaskInfo(

                        WINDOWING_MODE_PINNED, ACTIVITY_TYPE_UNDEFINED);

                if (pinnedTaskInfo != null) {

                    stackBounds = pinnedTaskInfo.bounds;

                }

            } catch (RemoteException e) {

                Log.e(TAG, "Error showing PIP menu", e);

        if (mPipMenuView != null) {

            final ParceledListSlice<RemoteAction> menuActions = resolveMenuActions();

            if (menuActions != null) {

                mPipMenuView.setActions(mPipBoundsState.getBounds(), menuActions.getList());

            }



            mPipMenuView.setActions(stackBounds, resolveMenuActions().getList());

        }

    }

libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipMenuView.java

+3 −1
Original line number Diff line number Diff line
@@ -374,8 +374,10 @@ public class PipMenuView extends FrameLayout { 
    void setActions(Rect stackBounds, List<RemoteAction> actions) {

        mActions.clear();

        mActions.addAll(actions);

        if (mMenuState == MENU_STATE_FULL) {

            updateActionViews(stackBounds);

        }

    }



    private void updateActionViews(Rect stackBounds) {

        ViewGroup expandContainer = findViewById(R.id.expand_container);

packages/SystemUI/src/com/android/systemui/wmshell/WMShellModule.java

+4 −3
Original line number Diff line number Diff line
@@ -157,11 +157,12 @@ public class WMShellModule { 
    @WMSingleton

    @Provides

    static PhonePipMenuController providesPipPhoneMenuController(Context context,

            PipMediaController pipMediaController, SystemWindows systemWindows,

            PipBoundsState pipBoundsState, PipMediaController pipMediaController,

            SystemWindows systemWindows,

            @ShellMainThread ShellExecutor mainExecutor,

            @ShellMainThread Handler mainHandler) {

        return new PhonePipMenuController(context, pipMediaController, systemWindows,

                mainExecutor, mainHandler);

        return new PhonePipMenuController(context, pipBoundsState, pipMediaController,

                systemWindows, mainExecutor, mainHandler);

    }



    @WMSingleton