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

Commit 2676b932 authored by Eghosa Ewansiha-Vlachavas's avatar Eghosa Ewansiha-Vlachavas
Browse files

[1/n] Remove use of `persist.wm.debug.desktop_mode_2` 

`persist.wm.debug.desktop_mode_2` is no longer needed as desktop
windowing now uses a runtime flag which can be modified using the
command: `adb shell device_config put lse_desktop_experience
com.android.window.flags.enable_desktop_windowing_mode (true/false)`.

Flag: NONE
Fixes: 326060855
Bug: 304778354
Test: build & `adb shell device_config put lse_desktop_experience
com.android.window.flags.enable_desktop_windowing_mode true && adb
reboot` desktop windowing mode should be enabled.

Change-Id: Ie7d6fd30aab211ab080561fddaad5f3044d6f0f5
parent 17130a37

libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopModeStatus.java

+2 −14
Original line number Diff line number Diff line
@@ -25,12 +25,6 @@ import com.android.window.flags.Flags; 
 */

public class DesktopModeStatus {



    /**

     * Flag to indicate whether desktop mode proto is available on the device

     */

    private static final boolean IS_PROTO2_ENABLED = SystemProperties.getBoolean(

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



    /**

     * Flag to indicate whether task resizing is veiled.

     */
@@ -73,16 +67,10 @@ public class DesktopModeStatus { 
            "persist.wm.debug.desktop_use_rounded_corners", true);



    /**

     * Return {@code true} is desktop windowing proto 2 is enabled

     * Return {@code true} if desktop windowing is enabled

     */

    public static boolean isEnabled() {

        // Check for aconfig flag first

        if (Flags.enableDesktopWindowingMode()) {

            return true;

        }

        // Fall back to sysprop flag

        // TODO(b/304778354): remove sysprop once desktop aconfig flag supports dynamic overriding

        return IS_PROTO2_ENABLED;

        return Flags.enableDesktopWindowingMode();

    }



    /**

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

+0 −6
Original line number Diff line number Diff line
@@ -369,12 +369,6 @@ object Flags { 
    @Keep

    val WM_BUBBLE_BAR = sysPropBooleanFlag("persist.wm.debug.bubble_bar", default = false)



    // TODO(b/260271148): Tracking bug

    @Keep

    @JvmField

    val WM_DESKTOP_WINDOWING_2 =

        sysPropBooleanFlag("persist.wm.debug.desktop_mode_2", default = false)



    // TODO(b/254513207): Tracking Bug to delete

    @Keep

    @JvmField

services/core/java/com/android/server/wm/DesktopModeLaunchParamsModifier.java

+1 −7
Original line number Diff line number Diff line
@@ -145,12 +145,6 @@ public class DesktopModeLaunchParamsModifier implements LaunchParamsModifier { 


    /** Whether desktop mode is enabled. */

    static boolean isDesktopModeEnabled() {

        // Check for aconfig flag first

        if (Flags.enableDesktopWindowingMode()) {

            return true;

        }

        // Fall back to sysprop flag

        // TODO(b/304778354): remove sysprop once desktop aconfig flag supports dynamic overriding

        return DESKTOP_MODE_PROTO2_SUPPORTED;

        return Flags.enableDesktopWindowingMode();

    }

}

services/tests/wmtests/src/com/android/server/wm/DesktopModeLaunchParamsModifierTests.java

+8 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import static android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM; 
import static com.android.server.wm.DesktopModeLaunchParamsModifier.DESKTOP_MODE_INITIAL_BOUNDS_SCALE;

import static com.android.server.wm.LaunchParamsController.LaunchParamsModifier.PHASE_BOUNDS;

import static com.android.server.wm.LaunchParamsController.LaunchParamsModifier.PHASE_DISPLAY;

import static com.android.server.wm.LaunchParamsController.LaunchParamsModifier.RESULT_CONTINUE;

import static com.android.server.wm.LaunchParamsController.LaunchParamsModifier.RESULT_DONE;

import static com.android.server.wm.LaunchParamsController.LaunchParamsModifier.RESULT_SKIP;
@@ -31,6 +32,7 @@ import static org.junit.Assert.assertEquals; 
import static org.mockito.Mockito.mock;



import android.graphics.Rect;

import android.platform.test.annotations.DisableFlags;

import android.platform.test.annotations.EnableFlags;

import android.platform.test.annotations.Presubmit;
@@ -71,6 +73,12 @@ public class DesktopModeLaunchParamsModifierTests extends WindowTestsBase { 
        mResult.reset();

    }



    @Test

    @DisableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_MODE)

    public void testReturnsContinueIfDesktopWindowingIsDisabled() {

        assertEquals(RESULT_CONTINUE, new CalculateRequestBuilder().setTask(null).calculate());

    }



    @Test

    @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_MODE)

    public void testReturnsSkipIfTaskIsNull() {