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

Commit c547cad6 authored by Orhan Uysal's avatar Orhan Uysal Committed by Android (Google) Code Review
Browse files

Merge "Remove override density on freeform launch" into main

parents 74f9c104 dcd66478

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

+1 −1
Original line number Diff line number Diff line
@@ -962,7 +962,7 @@ class DesktopTasksController( 
        }

        val wct = WindowContainerTransaction()

        if (isDesktopDensityOverrideSet()) {

            wct.setDensityDpi(task.token, DESKTOP_DENSITY_OVERRIDE)

            // TODO(344599474) reintroduce density changes behind a disabled flag

        }

        // Desktop Mode is showing and we're launching a new Task - we might need to minimize

        // a Task.

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopTasksControllerTest.kt

+4 −0
Original line number Diff line number Diff line
@@ -1113,6 +1113,8 @@ class DesktopTasksControllerTest : ShellTestCase() { 


  @Test

  fun handleRequest_freeformTask_alreadyInDesktop_noOverrideDensity_noConfigDensityChange() {

    // TODO(344599474) enable the test once the density change is behind a flag

    assumeTrue(false)

    assumeTrue(ENABLE_SHELL_TRANSITIONS)

    whenever(DesktopModeStatus.isDesktopDensityOverrideSet()).thenReturn(false)
@@ -1127,6 +1129,8 @@ class DesktopTasksControllerTest : ShellTestCase() { 


  @Test

  fun handleRequest_freeformTask_alreadyInDesktop_overrideDensity_hasConfigDensityChange() {

    // TODO(344599474) enable the test once the density change is behind a flag

    assumeTrue(false)

    assumeTrue(ENABLE_SHELL_TRANSITIONS)

    whenever(DesktopModeStatus.isDesktopDensityOverrideSet()).thenReturn(true)