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

Commit 53f2f8a8 authored by Jorge Gil's avatar Jorge Gil Committed by Android (Google) Code Review
Browse files

Merge "Desks: Add desk creation limit" into main

parents e875b051 8c69d9ff

core/res/res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -7392,6 +7392,9 @@ 
    <!-- Maximum number of active tasks on a given Desktop Windowing session. Set to 0 for unlimited. -->

    <integer name="config_maxDesktopWindowingActiveTasks">0</integer>



    <!-- Maximum number desks on a device running Desktop Windowing. Set to 0 for unlimited. -->

    <integer name="config_maxDesktopWindowingDesks">0</integer>



    <!-- Whether a display enters desktop mode by default when the windowing mode of the display's

         root TaskDisplayArea is set to WINDOWING_MODE_FREEFORM. -->

    <bool name="config_enterDesktopByDefaultOnFreeformDisplay">false</bool>

core/res/res/values/symbols.xml

+3 −0
Original line number Diff line number Diff line
@@ -6009,6 +6009,9 @@ 
  <!-- Maximum number of active tasks on a given Desktop Windowing session. Set to 0 for unlimited. -->

  <java-symbol type="integer" name="config_maxDesktopWindowingActiveTasks"/>



  <!-- Maximum number desks on a device running Desktop Windowing. Set to 0 for unlimited. -->

  <java-symbol type="integer" name="config_maxDesktopWindowingDesks"/>



  <!-- Whether a display enters desktop mode by default when the windowing mode of the display's

       root TaskDisplayArea is set to WINDOWING_MODE_FREEFORM. -->

  <java-symbol type="bool" name="config_enterDesktopByDefaultOnFreeformDisplay" />

libs/WindowManager/Shell/shared/src/com/android/wm/shell/shared/desktopmode/DesktopConfig.kt

+3 −0
Original line number Diff line number Diff line
@@ -78,6 +78,9 @@ interface DesktopConfig { 
    /** Returns the maximum limit on the number of tasks to show in on a desk at any one time. */

    val maxTaskLimit: Int



    /** Returns the maximum limit on the number of desks a user can create. */

    val maxDeskLimit: Int



    /** Override density for tasks when they're inside the desktop.  */

    val desktopDensityOverride: Int

libs/WindowManager/Shell/shared/src/com/android/wm/shell/shared/desktopmode/DesktopConfigImpl.kt

+15 −0
Original line number Diff line number Diff line
@@ -92,6 +92,12 @@ class DesktopConfigImpl( 
            context.getResources().getInteger(R.integer.config_maxDesktopWindowingActiveTasks),

        )



    override val maxDeskLimit: Int =

        SystemProperties.getInt(

            MAX_DESK_LIMIT_SYS_PROP,

            context.getResources().getInteger(R.integer.config_maxDesktopWindowingDesks),

        )



    override val desktopDensityOverride: Int =

        SystemProperties.getInt("persist.wm.debug.desktop_mode_density", 284)
@@ -145,6 +151,15 @@ class DesktopConfigImpl( 
         */

        private const val MAX_TASK_LIMIT_SYS_PROP = "persist.wm.debug.desktop_max_task_limit"



        /**

         * Sysprop declaring the maximum number of Desks a user can create.

         *

         * If it is not defined, then `R.integer.config_maxDesktopWindowingDesks` is used.

         *

         * The limit does NOT affect desks created by connecting additional displays.

         */

        private const val MAX_DESK_LIMIT_SYS_PROP = "persist.wm.debug.desktop_max_desk_limit"



        /**

         * Sysprop declaring whether to enable drag-to-maximize for desktop windows.

         *

libs/WindowManager/Shell/shared/src/com/android/wm/shell/shared/desktopmode/FakeDesktopConfig.kt

+2 −0
Original line number Diff line number Diff line
@@ -44,6 +44,8 @@ class FakeDesktopConfig : DesktopConfig { 


    override var maxTaskLimit: Int = 0



    override var maxDeskLimit: Int = 0



    override var desktopDensityOverride: Int = 284



    override fun dump(