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

Commit 157fb14b authored by Jerry Liu's avatar Jerry Liu
Browse files

Desktop screenshots: Set the minimum region box size to 48dp 

After dragging the region box, check if the height/width < 48dp. Resize
the box if the region box is too small. Also cap the size when resizing
the region box.

Bug: 435700935
Test: Manually on DUT
Flag: com.android.systemui.large_screen_screencapture
Change-Id: I6786a87f21e51d3353105ac64c0867ebcf87b38f
parent 35538a4d

packages/SystemUI/src/com/android/systemui/screencapture/record/largescreen/ui/compose/RegionBox.kt

+20 −1
Original line number Diff line number Diff line
@@ -216,6 +216,25 @@ private class RegionBoxState(private val minSizePx: Float, private val touchArea 
    }



    fun dragEnd() {

        // Apply the minimum region box size after the drag.

        rect?.let { currentRect ->

            // Coerce the box dimensions to be within the min size and screen size.

            val finalWidth = currentRect.width.coerceIn(minSizePx, screenWidth)

            val finalHeight = currentRect.height.coerceIn(minSizePx, screenHeight)



            // Ensure the box's top-left corner is positioned so the box remains

            // entirely within the screen bounds.

            val finalLeft = currentRect.left.coerceAtMost(screenWidth - finalWidth)

            val finalTop = currentRect.top.coerceAtMost(screenHeight - finalHeight)



            rect =

                Rect(

                    left = finalLeft,

                    top = finalTop,

                    right = finalLeft + finalWidth,

                    bottom = finalTop + finalHeight,

                )

        }

        dragMode = DragMode.NONE

        resizeZone = null

    }
@@ -243,7 +262,7 @@ fun RegionBox( 
    val density = LocalDensity.current



    // The minimum size allowed for the box.

    val minSize = 1.dp

    val minSize = 48.dp

    val minSizePx = remember(density) { with(density) { minSize.toPx() } }



    // The touch area for detecting an edge or corner resize drag.