Merge "Update bubble expanded view drag zones" into main (1ff84a27) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/multivalentScreenshotTests/goldens/onDevice/tablet/light_landscape_dragZones_expandedView.png

−66 B (33.8 KiB)

Loading image diff...

libs/WindowManager/Shell/multivalentScreenshotTests/goldens/onDevice/tablet/light_portrait_dragZones_expandedView.png

+358 B (35.8 KiB)

Loading image diff...

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()
		@@ -359,9 +361,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
		@@ -524,7 +528,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 =