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

Commit 9e472c98 authored by Liran Binyamin's avatar Liran Binyamin
Browse files

Update bubble expanded view drag zones 

1. Move the bottom split drag zone up over the dismiss zone
2. Offset the desktop window drag zone from the center of the screen
   (checked with UX -- this isn't centered to ensure the split zone is
   large enough)

Flag: com.android.wm.shell.enable_bubble_bar
Fixes: 416092942
Test: DragZoneFactoryScreenshotTest

Change-Id: I59023b655063147dd5ffe740b89431e79d297277
parent 004b3368

libs/WindowManager/Shell/shared/src/com/android/wm/shell/shared/bubbles/DragZoneFactory.kt

+7 −3
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ class DragZoneFactory( 
    private var desktopWindowDragZoneHeight = 0

    private var desktopWindowFromExpandedViewDragZoneWidth = 0

    private var desktopWindowFromExpandedViewDragZoneHeight = 0

    private var desktopWindowFromExpandedViewDragZoneYOffset = 0

    private var splitFromBubbleDragZoneHeight = 0

    private var splitFromBubbleDragZoneWidth = 0

    private var hSplitFromExpandedViewDragZoneWidth = 0
@@ -172,6 +173,7 @@ class DragZoneFactory( 
        desktopWindowDragZoneHeight = 300.dpToPx()

        desktopWindowFromExpandedViewDragZoneWidth = 200.dpToPx()

        desktopWindowFromExpandedViewDragZoneHeight = 350.dpToPx()

        desktopWindowFromExpandedViewDragZoneYOffset = 25.dpToPx()

        splitFromBubbleDragZoneHeight = 100.dpToPx()

        splitFromBubbleDragZoneWidth = 60.dpToPx()

        hSplitFromExpandedViewDragZoneWidth = 60.dpToPx()
@@ -366,9 +368,11 @@ class DragZoneFactory( 
                RectZone(

                    Rect(

                        windowBounds.right / 2 - desktopWindowFromExpandedViewDragZoneWidth / 2,

                        windowBounds.bottom / 2 - desktopWindowFromExpandedViewDragZoneHeight / 2,

                        windowBounds.bottom / 2 - desktopWindowFromExpandedViewDragZoneHeight / 2 -

                            desktopWindowFromExpandedViewDragZoneYOffset,

                        windowBounds.right / 2 + desktopWindowFromExpandedViewDragZoneWidth / 2,

                        windowBounds.bottom / 2 + desktopWindowFromExpandedViewDragZoneHeight / 2

                        windowBounds.bottom / 2 + desktopWindowFromExpandedViewDragZoneHeight / 2 -

                            desktopWindowFromExpandedViewDragZoneYOffset

                    ),

                ),

            dropTarget = desktopWindowDropTarget
@@ -531,7 +535,7 @@ class DragZoneFactory( 
            val splitZoneLeft = windowBounds.right / 2 - vSplitFromExpandedViewDragZoneWidth / 2

            val splitZoneRight = splitZoneLeft + vSplitFromExpandedViewDragZoneWidth

            val bottomSplitZoneBottom =

                windowBounds.bottom - dismissDragZoneBottomMargin - dismissDragZoneRadius

                windowBounds.bottom - dismissDragZoneBottomMargin - dismissDragZoneRadius * 2

            listOf(

                DragZone.Split.Top(

                    bounds =