@@ -109,6 +109,10 @@ class AppDimens private constructor(
109109 private val fluidDeviceQualifiers = mutableMapOf<FluidDeviceType , FluidConfig >()
110110 private val fluidScreenQualifiers = mutableMapOf<Int , FluidConfig >()
111111
112+ // Interpolated-specific
113+ private var interpolatedApplyAR: Boolean = true
114+ private var interpolatedArSensitivity: Float? = null
115+
112116 // AutoSize-specific (v2.1)
113117 private var autoSizeEnabled: Boolean = false
114118 private var autoSizeMinValue: Float? = null
@@ -1497,12 +1501,19 @@ class AppDimens private constructor(
14971501 minWidth = fluidMinWidth,
14981502 maxWidth = fluidMaxWidth,
14991503 deviceQualifiers = fluidDeviceQualifiers,
1500- screenQualifiers = fluidScreenQualifiers
1504+ screenQualifiers = fluidScreenQualifiers,
1505+ applyAspectRatio = false , // FLUID ignores global, uses individual control only
1506+ arSensitivity = null
15011507 )
15021508 } else {
15031509 null
15041510 }
15051511
1512+ val interpolatedParams = Calculator .InterpolatedParams (
1513+ applyAspectRatio = interpolatedApplyAR,
1514+ arSensitivity = interpolatedArSensitivity
1515+ )
1516+
15061517 val constraints = Calculator .Constraints (
15071518 minValue = minValue,
15081519 maxValue = maxValue,
@@ -1549,6 +1560,7 @@ class AppDimens private constructor(
15491560 defaultParams = defaultParams,
15501561 perceptualParams = perceptualParams,
15511562 fluidParams = fluidParams,
1563+ interpolatedParams = interpolatedParams,
15521564 constraints = constraints,
15531565 customQualifiers = customQualifiers
15541566 )
@@ -1565,6 +1577,7 @@ class AppDimens private constructor(
15651577 defaultParams = defaultParams,
15661578 perceptualParams = perceptualParams,
15671579 fluidParams = fluidParams,
1580+ interpolatedParams = interpolatedParams,
15681581 constraints = constraints,
15691582 customQualifiers = customQualifiers
15701583 )
0 commit comments