PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow pane height to shrink when setting topology

Browse Source 
A recent CL added a feature to prevent the pane height from shrinking to
stop widgets from moving around. This is actually not a great experience
because a temporary state can keep the pane height very tall and
increase scrolling.

Flag: com.android.settings.flags.display_topology_pane_in_display_list
Bug: b/352648432
Test: change topology to be vertically shorter and verify the pane height shrinks
Change-Id: Ic48bfecea083a45c702c8719e3c93ceba55ae872
This commit is contained in:
Matthew DeVore
2025-02-01 00:39:00 +00:00
parent 531d9d6e6a
commit e8143a07a4
2 changed files with 13 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/com/android/settings/connecteddevice/display/DisplayTopology.kt
View File

@@ -73,9 +73,6 @@ fun Float.atLeast(n: Number): Float = max(this, n.toFloat())
* position. In practice the origin will be the upper-left coordinate of the primary display.
*
* @param paneWidth width of the pane in view coordinates
* @param minPaneHeight smallest allowed height of the pane in view coordinates. This will not
* affect the block ratio, but only the final height of the pane and the
* position of the display bounds' center.
* @param minEdgeLength the smallest length permitted of a display block. This should be set based
* on accessibility requirements, but also accounting for padding that appears
* around each button.
@@ -85,7 +82,7 @@ fun Float.atLeast(n: Number): Float = max(this, n.toFloat())
* @param displaysPos the absolute topology coordinates for each display in the topology.
*/
class TopologyScale(
paneWidth: Int, minPaneHeight: Float, minEdgeLength: Float, maxEdgeLength: Float,
paneWidth: Int, minEdgeLength: Float, maxEdgeLength: Float,
displaysPos: Collection<RectF>) {
/** Scale of block sizes to real-world display sizes. Should be less than 1. */
val blockRatio: Float
@@ -124,12 +121,11 @@ class TopologyScale(
// requirements.
.atLeast(minEdgeLength / smallestDisplayDim)
paneHeight = minPaneHeight
// A tall pane is likely to result in more scrolling. So we
// prevent the height from growing too large here, by limiting vertical padding to
// 1.5x of the minEdgeLength on each side. This keeps a comfortable amount of
// padding without it resulting in too much deadspace.
.atLeast(blockRatio * displayBounds.height() + minEdgeLength * 3f)
// A tall pane is likely to result in more scrolling. So we
// prevent the height from growing too large here, by limiting vertical padding to
// 1.5x of the minEdgeLength on each side. This keeps a comfortable amount of
// padding without it resulting in too much deadspace.
paneHeight = blockRatio * displayBounds.height() + minEdgeLength * 3f
// Set originPaneXY (the location of 0,0 in display space in the pane's coordinate system)
// such that the display bounds rect is centered in the pane.
@@ -404,7 +400,7 @@ class DisplayTopologyPreference(context : Context)
// pixels, and the display coordinates are in density-independent pixels.
val dpi = injector.densityDpi
val scaling = TopologyScale(
mPaneContent.width, minPaneHeight = mTopologyInfo?.scaling?.paneHeight ?: 0f,
mPaneContent.width,
minEdgeLength = DisplayTopology.dpToPx(60f, dpi),
maxEdgeLength = DisplayTopology.dpToPx(256f, dpi),
newBounds.map { it.second }.toList())