Merge "Use gsfc system font in new clock" into main (6b9fb501) · Commits · e / os / android_frameworks_base

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

+4 −1

Original line number	Diff line number	Diff line
		@@ -68,7 +68,10 @@ private constructor(
		seedColor = null,
		overrideChroma = null,
		typefaceCache =
		TypefaceCache(messageBuffer) { Typeface.createFromAsset(pluginCtx.assets, it) },
		TypefaceCache(messageBuffer) {
		// TODO(b/364680873): Move constant to config_clockFontFamily when shipping
		return@TypefaceCache Typeface.create("google-sans-flex-clock", Typeface.NORMAL)
		},
		getThemeSeedColor = getThemeSeedColor ?: Companion::getThemeSeedColor,
		messageBuffer = messageBuffer,
		)

+5 −1

Original line number	Diff line number	Diff line
		@@ -17,6 +17,8 @@ import android.content.Context
		import android.content.res.Resources
		import android.view.LayoutInflater
		import com.android.systemui.customization.R
		import com.android.systemui.log.core.LogLevel
		import com.android.systemui.log.core.LogcatOnlyMessageBuffer
		import com.android.systemui.plugins.clocks.ClockController
		import com.android.systemui.plugins.clocks.ClockId
		import com.android.systemui.plugins.clocks.ClockMessageBuffers
		@@ -53,7 +55,9 @@ class DefaultClockProvider(
		}

		return if (clockReactiveVariants) {
		val assets = AssetLoader(ctx, ctx, "clocks/", messageBuffers!!.infraMessageBuffer)
		val buffer =
		messageBuffers?.infraMessageBuffer ?: LogcatOnlyMessageBuffer(LogLevel.INFO)
		val assets = AssetLoader(ctx, ctx, "clocks/", buffer)
		FlexClockController(ctx, resources, assets, FLEX_DESIGN, messageBuffers)
		} else {
		DefaultClockController(

+2 −2

Original line number	Diff line number	Diff line
		@@ -71,7 +71,7 @@ class FlexClockFaceController(
		val layer = face.layers[0]

		layerController =
		if (isLargeClock)
		if (isLargeClock) {
		ComposedDigitalLayerController(
		ctx,
		resources,
		@@ -79,7 +79,7 @@ class FlexClockFaceController(
		layer as ComposedDigitalHandLayer,
		messageBuffer,
		)
		else {
		} else {
		val childView = SimpleDigitalClockTextView(ctx, messageBuffer)
		SimpleDigitalHandLayerController(
		ctx,