Merge "Apply max wdth of 120 to small gsf clock" into main (ad8c107c) · Commits · e / os / android_frameworks_base

packages/SystemUI/customization/src/com/android/systemui/shared/clocks/FlexClockFaceController.kt

+14 −1

Original line number	Diff line number	Diff line
		@@ -125,7 +125,19 @@ class FlexClockFaceController(clockCtx: ClockContext, private val isLargeClock:
		layerController.faceEvents.onThemeChanged(theme)
		}

		override fun onFontAxesChanged(axes: List<ClockFontAxisSetting>) {
		override fun onFontAxesChanged(settings: List<ClockFontAxisSetting>) {
		var axes = settings
		if (!isLargeClock) {
		axes =
		axes.map { axis ->
		if (axis.key == "wdth" && axis.value > SMALL_CLOCK_MAX_WDTH) {
		axis.copy(value = SMALL_CLOCK_MAX_WDTH)
		} else {
		axis
		}
		}
		}

		layerController.events.onFontAxesChanged(axes)
		}

		@@ -236,6 +248,7 @@ class FlexClockFaceController(clockCtx: ClockContext, private val isLargeClock:
		}

		companion object {
		val SMALL_CLOCK_MAX_WDTH = 120f
		val SMALL_LAYER_CONFIG =
		LayerConfig(
		timespec = DigitalTimespec.TIME_FULL_FORMAT,