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

Commit 6e2a5b2b authored by Hongwei Wang's avatar Hongwei Wang Committed by Automerger Merge Worker
Browse files

Merge "Default on ENABLE_MOVE_FLOATING_WINDOW_IN_TABLETOP" into tm-qpr-dev am:... 

Merge "Default on ENABLE_MOVE_FLOATING_WINDOW_IN_TABLETOP" into tm-qpr-dev am: 7d870b7d am: 4d1ed69a am: aecfa045

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



Change-Id: I885c7b5ca041f761c26c02f987353e0dad803d08
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ed362e2b aecfa045

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

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ public class TabletopModeController implements 
     */

    private static final boolean ENABLE_MOVE_FLOATING_WINDOW_IN_TABLETOP =

            SystemProperties.getBoolean(

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

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



    /**

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

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

+1 −1
Original line number Diff line number Diff line
@@ -516,7 +516,7 @@ object Flags { 
    @JvmField

    val ENABLE_MOVE_FLOATING_WINDOW_IN_TABLETOP =

        sysPropBooleanFlag(

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

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



    // 1200 - predictive back

    @Keep