Merge "DisplayTopology: rearrange uses raw overlap values" into main (dac760e9) · Commits · e / os / android_frameworks_base

core/java/android/hardware/display/DisplayTopology.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -275,7 +275,7 @@ public final class DisplayTopology implements Parcelable {

		float offset;
		int pos;
		if (Math.abs(xOverlap) > Math.abs(yOverlap)) {
		if (xOverlap > yOverlap) {
		// Deviation in each dimension is a penalty in the potential parenting. To
		// get the X deviation, overlap is subtracted from the lesser width so that
		// a maximum overlap results in a deviation of zero.

core/tests/coretests/src/android/hardware/display/DisplayTopologyTest.kt

+72 −3

Original line number	Diff line number	Diff line
		@@ -635,8 +635,7 @@ class DisplayTopologyTest {
		// 222
		RectF(0f, 0f, 30f, 30f),
		RectF(40f, 10f, 70f, 40f),
		RectF(80.5f, 50f, 110f, 80f), // left+=0.5 to cause a preference for
		// TOP/BOTTOM attach
		RectF(80.5f, 50f, 110f, 80f),
		)

		verifyDisplay(root, id = 0, width = 30f, height = 30f, noOfChildren = 1)
		@@ -644,7 +643,7 @@ class DisplayTopologyTest {
		root.children[0], id = 1, width = 30f, height = 30f, POSITION_RIGHT, offset = 10f,
		noOfChildren = 1)
		verifyDisplay(
		root.children[0].children[0], id = 2, width = 29.5f, height = 30f, POSITION_BOTTOM,
		root.children[0].children[0], id = 2, width = 29.5f, height = 30f, POSITION_RIGHT,
		offset = 30f, noOfChildren = 0)
		}

		@@ -701,6 +700,76 @@ class DisplayTopologyTest {
		offset = -1880f, noOfChildren = 0)
		}

		@Test
		fun rearrange_preferLongHorizontalShiftOverAttachToCorner() {
		// An earlier implementation decided vertical or horizontal clamp direction based on the abs
		// value of the overlap in each dimension, rather than the raw overlap.

		// This horizontal span is twice the height of displays, making abs(xOverlap) > yOverlap,
		// i.e. abs(-60) > 30
		// \|
		// \|----\|
		// 000 111
		// 000 111
		// 000 111

		// Before fix:
		// 000
		// 000
		// 000
		// 111
		// 111
		// 111

		// After fix:
		// 000111
		// 000111
		// 000111

		val root = rearrangeRects(
		RectF(0f, 0f, 30f, 30f),
		RectF(90f, 0f, 120f, 30f),
		)

		verifyDisplay(root, id = 0, width = 30f, height = 30f, noOfChildren = 1)
		verifyDisplay(
		root.children[0], id = 1, width = 30f, height = 30f, POSITION_RIGHT,
		offset = 0f, noOfChildren = 0)
		}

		@Test
		fun rearrange_preferLongVerticalShiftOverAttachToCorner() {
		// Before:
		// 111
		// 111
		// 111
		// \|
		// \|- This vertical span is 40dp
		// \|
		// \|
		// 000
		// 000
		// 000

		// After:
		// 111
		// 111
		// 111
		// 000
		// 000
		// 000

		val root = rearrangeRects(
		RectF(20f, 70f, 50f, 100f),
		RectF(00f, 0f, 30f, 30f),
		)

		verifyDisplay(root, id = 0, width = 30f, height = 30f, noOfChildren = 1)
		verifyDisplay(
		root.children[0], id = 1, width = 30f, height = 30f, POSITION_TOP,
		offset = -20f, noOfChildren = 0)
		}

		@Test
		fun copy() {
		val display1 = DisplayTopology.TreeNode(/* displayId= / 1, / width= */ 200f,