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

Commit 9c5bc7bb authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic "fix-tiling" into main 

* changes:
  Refactor DesktopTestHelpers
  Always reorder surfaces on focus change
parents 9e1bc9ea 057015f7

libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/tiling/DesktopTilingWindowDecoration.kt

+2 −3
Original line number Diff line number Diff line
@@ -492,9 +492,8 @@ class DesktopTilingWindowDecoration( 


    // Only called if [taskInfo] relates to a focused task

    private fun isTilingRefocused(taskInfo: RunningTaskInfo): Boolean {

        return !isTilingFocused &&

            (taskInfo.taskId == leftTaskResizingHelper?.taskInfo?.taskId ||

                taskInfo.taskId == rightTaskResizingHelper?.taskInfo?.taskId)

        return taskInfo.taskId == leftTaskResizingHelper?.taskInfo?.taskId ||

                taskInfo.taskId == rightTaskResizingHelper?.taskInfo?.taskId

    }



    private fun buildTiledTasksMoveToFront(leftOnTop: Boolean): WindowContainerTransaction {

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/compatui/AppCompatUtilsTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ import android.testing.AndroidTestingRunner 
import androidx.test.filters.SmallTest

import com.android.internal.R

import com.android.wm.shell.ShellTestCase

import com.android.wm.shell.desktopmode.DesktopTestHelpers.Companion.createFreeformTask

import com.android.wm.shell.desktopmode.DesktopTestHelpers.createFreeformTask

import org.junit.Assert.assertFalse

import org.junit.Assert.assertTrue

import org.junit.Test

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

+2 −2
Original line number Diff line number Diff line
@@ -39,8 +39,8 @@ import com.android.wm.shell.ShellTaskOrganizer 
import com.android.wm.shell.ShellTestCase

import com.android.wm.shell.common.ShellExecutor

import com.android.wm.shell.common.TaskStackListenerImpl

import com.android.wm.shell.desktopmode.DesktopTestHelpers.Companion.createFreeformTask

import com.android.wm.shell.desktopmode.DesktopTestHelpers.Companion.createFullscreenTask

import com.android.wm.shell.desktopmode.DesktopTestHelpers.createFreeformTask

import com.android.wm.shell.desktopmode.DesktopTestHelpers.createFullscreenTask

import com.android.wm.shell.desktopmode.persistence.Desktop

import com.android.wm.shell.desktopmode.persistence.DesktopPersistentRepository

import com.android.wm.shell.desktopmode.persistence.DesktopRepositoryInitializer

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

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ import com.android.wm.shell.TestShellExecutor 
import com.android.wm.shell.common.DisplayController

import com.android.wm.shell.common.DisplayLayout

import com.android.wm.shell.desktopmode.DesktopImmersiveController.ExitReason.USER_INTERACTION

import com.android.wm.shell.desktopmode.DesktopTestHelpers.Companion.createFreeformTask

import com.android.wm.shell.desktopmode.DesktopTestHelpers.createFreeformTask

import com.android.wm.shell.sysui.ShellInit

import com.android.wm.shell.transition.Transitions

import com.android.wm.shell.util.StubTransaction

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

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ import com.android.wm.shell.MockToken 
import com.android.wm.shell.RootTaskDisplayAreaOrganizer

import com.android.wm.shell.ShellTaskOrganizer

import com.android.wm.shell.ShellTestCase

import com.android.wm.shell.desktopmode.DesktopTestHelpers.Companion.createFreeformTask

import com.android.wm.shell.desktopmode.DesktopTestHelpers.createFreeformTask

import com.android.wm.shell.transition.FocusTransitionObserver

import com.google.common.truth.Truth.assertThat

import kotlinx.coroutines.ExperimentalCoroutinesApi