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

Commit b9ce69db authored by Sebastián Franco's avatar Sebastián Franco Committed by Android (Google) Code Review
Browse files

Merge "Correctly map the drag view position to the Workspace" into main

parents 412821fa 4bedb184

tests/src/com/android/launcher3/celllayout/integrationtest/TestUtils.kt

+5 −2
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.graphics.Rect 
import android.view.View

import android.view.ViewGroup

import com.android.launcher3.CellLayout

import com.android.launcher3.Utilities

import com.android.launcher3.Workspace

import com.android.launcher3.util.CellAndSpan

import com.android.launcher3.widget.LauncherAppWidgetHostView
@@ -54,7 +55,7 @@ object TestUtils { 
        return view as LauncherAppWidgetHostView

    }



    fun getCellTopLeftRelativeToCellLayout(

    fun getCellTopLeftRelativeToWorkspace(

        workspace: Workspace<*>,

        cellAndSpan: CellAndSpan

    ): Point {
@@ -67,6 +68,8 @@ object TestUtils { 
            cellAndSpan.spanY,

            target

        )

        return Point(target.left, target.top)

        val point = floatArrayOf(target.left.toFloat(), target.top.toFloat())

        Utilities.getDescendantCoordRelativeToAncestor(cellLayout, workspace, point, false)

        return Point(point[0].toInt(), point[1].toInt())

    }

}