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

Commit 4b768acc authored by Wale Ogunwale's avatar Wale Ogunwale Committed by Android (Google) Code Review
Browse files

Merge "Added WindowManagerWrapper#setProvidesInsetsTypes"

parents c861b286 f1c1fd27

core/java/android/window/TaskOrganizer.java

+3 −2
Original line number Diff line number Diff line
@@ -39,13 +39,14 @@ public class TaskOrganizer extends WindowOrganizer { 
    private ITaskOrganizerController mTaskOrganizerController;



    public TaskOrganizer() {

        mTaskOrganizerController = getController();

        this(null);

    }



    /** @hide */

    @VisibleForTesting

    public TaskOrganizer(ITaskOrganizerController taskOrganizerController) {

        mTaskOrganizerController = taskOrganizerController;

        mTaskOrganizerController = taskOrganizerController != null

                ? taskOrganizerController : getController();

    }



    /**

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

+1 −4
Original line number Diff line number Diff line
@@ -66,10 +66,7 @@ public class ShellTaskOrganizer extends TaskOrganizer { 


    public ShellTaskOrganizer(SyncTransactionQueue syncQueue, TransactionPool transactionPool,

            ShellExecutor mainExecutor, ShellExecutor animExecutor) {

        super();

        addListener(new FullscreenTaskListener(syncQueue), WINDOWING_MODE_FULLSCREEN);

        mTransitions = new Transitions(this, transactionPool, mainExecutor, animExecutor);

        if (Transitions.ENABLE_SHELL_TRANSITIONS) registerTransitionPlayer(mTransitions);

        this(null, syncQueue, transactionPool, mainExecutor, animExecutor);

    }



    @VisibleForTesting

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

+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ import java.util.function.Consumer; 
 * This class is also responsible for general resize/offset PiP operations within SysUI component,

 * see also {@link PipMotionHelper}.

 */

public class PipTaskOrganizer extends TaskOrganizer implements ShellTaskOrganizer.TaskListener,

public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener,

        DisplayController.OnDisplaysChangedListener {

    private static final String TAG = PipTaskOrganizer.class.getSimpleName();

    private static final boolean DEBUG = false;

packages/SystemUI/shared/src/com/android/systemui/shared/system/WindowManagerWrapper.java

+14 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import android.graphics.Rect; 
import android.os.Handler;

import android.os.RemoteException;

import android.util.Log;

import android.view.InsetsState;

import android.view.SurfaceControl;

import android.view.WindowManager;

import android.view.WindowManagerGlobal;
@@ -81,12 +82,25 @@ public class WindowManagerWrapper { 
            WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_SECONDARY;

    public static final int WINDOWING_MODE_FREEFORM = WindowConfiguration.WINDOWING_MODE_FREEFORM;



    public static final int ITYPE_EXTRA_NAVIGATION_BAR = InsetsState.ITYPE_EXTRA_NAVIGATION_BAR;



    private static final WindowManagerWrapper sInstance = new WindowManagerWrapper();



    public static WindowManagerWrapper getInstance() {

        return sInstance;

    }





    /**

     * Sets {@param providesInsetsTypes} as the inset types provided by {@param params}.

     * @param params The window layout params.

     * @param providesInsetsTypes The inset types we would like this layout params to provide.

     */

    public void setProvidesInsetsTypes(WindowManager.LayoutParams params,

            int[] providesInsetsTypes) {

        params.providesInsetsTypes = providesInsetsTypes;

    }



    /**

     * @return the stable insets for the primary display.

     */