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

Commit 522c00c6 authored by Hongwei Wang's avatar Hongwei Wang Committed by Android (Google) Code Review
Browse files

Merge "Cleanup ENABLE_MOVE_FLOATING_WINDOW_IN_TABLETOP" into udc-dev

parents 1b3a3c65 631d6539

libs/WindowManager/Shell/src/com/android/wm/shell/common/TabletopModeController.java

+0 −16
Original line number Diff line number Diff line
@@ -53,14 +53,6 @@ import java.util.Set; 
public class TabletopModeController implements

        DevicePostureController.OnDevicePostureChangedListener,

        DisplayController.OnDisplaysChangedListener {

    /**

     * When {@code true}, floating windows like PiP would auto move to the position

     * specified by {@link #PREFER_TOP_HALF_IN_TABLETOP} when in tabletop mode.

     */

    private static final boolean ENABLE_MOVE_FLOATING_WINDOW_IN_TABLETOP =

            SystemProperties.getBoolean(

                    "persist.wm.debug.enable_move_floating_window_in_tabletop", true);



    /**

     * Prefer the {@link #PREFERRED_TABLETOP_HALF_TOP} if this flag is enabled,

     * {@link #PREFERRED_TABLETOP_HALF_BOTTOM} otherwise.
@@ -162,14 +154,6 @@ public class TabletopModeController implements 
        }

    }



    /**

     * @return {@code true} if floating windows like PiP would auto move to the position

     * specified by {@link #getPreferredHalfInTabletopMode()} when in tabletop mode.

     */

    public boolean enableMoveFloatingWindowInTabletop() {

        return ENABLE_MOVE_FLOATING_WINDOW_IN_TABLETOP;

    }



    /** @return Preferred half for floating windows like PiP when in tabletop mode. */

    @PreferredTabletopHalf

    public int getPreferredHalfInTabletopMode() {

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

+0 −1
Original line number Diff line number Diff line
@@ -677,7 +677,6 @@ public class PipController implements PipTransitionController.PipTransitionCallb 
                });



        mTabletopModeController.registerOnTabletopModeChangedListener((isInTabletopMode) -> {

            if (!mTabletopModeController.enableMoveFloatingWindowInTabletop()) return;

            final String tag = "tabletop-mode";

            if (!isInTabletopMode) {

                mPipBoundsState.removeNamedUnrestrictedKeepClearArea(tag);

packages/SystemUI/src/com/android/systemui/flags/Flags.kt

+0 −7
Original line number Diff line number Diff line
@@ -535,13 +535,6 @@ object Flags { 
    val ENABLE_PIP_APP_ICON_OVERLAY =

        sysPropBooleanFlag(1115, "persist.wm.debug.enable_pip_app_icon_overlay", default = true)



    // TODO(b/272110828): Tracking bug

    @Keep

    @JvmField

    val ENABLE_MOVE_FLOATING_WINDOW_IN_TABLETOP =

        sysPropBooleanFlag(

            1116, "persist.wm.debug.enable_move_floating_window_in_tabletop", default = true)



    // TODO(b/273443374): Tracking Bug

    @Keep

    @JvmField val LOCKSCREEN_LIVE_WALLPAPER =