Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Cleanup ENABLE_MOVE_FLOATING_WINDOW_IN_TABLETOP" into udc-dev

Browse Source
This commit is contained in:
Hongwei Wang
2023-05-22 18:49:47 +00:00
committed by Android (Google) Code Review
parent 1b3a3c65e1 631d6539c0
commit 522c00c69f
3 changed files with 0 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -53,14 +53,6 @@ import java.util.Set;
public class TabletopModeController implements public class TabletopModeController implements
DevicePostureController.OnDevicePostureChangedListener, DevicePostureController.OnDevicePostureChangedListener,
DisplayController.OnDisplaysChangedListener { 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, * Prefer the {@link #PREFERRED_TABLETOP_HALF_TOP} if this flag is enabled,
* {@link #PREFERRED_TABLETOP_HALF_BOTTOM} otherwise. * {@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. */ /** @return Preferred half for floating windows like PiP when in tabletop mode. */
@PreferredTabletopHalf @PreferredTabletopHalf
public int getPreferredHalfInTabletopMode() { public int getPreferredHalfInTabletopMode() {

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

@@ -677,7 +677,6 @@ public class PipController implements PipTransitionController.PipTransitionCallb
}); });
mTabletopModeController.registerOnTabletopModeChangedListener((isInTabletopMode) -> { mTabletopModeController.registerOnTabletopModeChangedListener((isInTabletopMode) -> {
if (!mTabletopModeController.enableMoveFloatingWindowInTabletop()) return;
final String tag = "tabletop-mode"; final String tag = "tabletop-mode";
if (!isInTabletopMode) { if (!isInTabletopMode) {
mPipBoundsState.removeNamedUnrestrictedKeepClearArea(tag); mPipBoundsState.removeNamedUnrestrictedKeepClearArea(tag);

7
packages/SystemUI/src/com/android/systemui/flags/Flags.kt
View File

@@ -535,13 +535,6 @@ object Flags {
val ENABLE_PIP_APP_ICON_OVERLAY = val ENABLE_PIP_APP_ICON_OVERLAY =
sysPropBooleanFlag(1115, "persist.wm.debug.enable_pip_app_icon_overlay", default = true) 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 // TODO(b/273443374): Tracking Bug
@Keep @Keep
@JvmField val LOCKSCREEN_LIVE_WALLPAPER = @JvmField val LOCKSCREEN_LIVE_WALLPAPER =