From 6d0af956af38267b376abea9ffb8c36920f9782d Mon Sep 17 00:00:00 2001 From: Nick Ning Date: Wed, 2 Feb 2022 21:46:10 +0000 Subject: [PATCH] Use system clock font for dream clock. Use font specified in UX design and in sync with the Lock Screen clock. Bug: 215188395 Test: manual Change-Id: Ide25c26125ef40860fe9f7682abbdcb15ac88565 --- .../layout/dream_overlay_complication_clock_time.xml | 2 +- .../dagger/DreamClockTimeComplicationComponent.java | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/packages/SystemUI/res/layout/dream_overlay_complication_clock_time.xml b/packages/SystemUI/res/layout/dream_overlay_complication_clock_time.xml index a41d34f8ab41f..82c8d5f04327f 100644 --- a/packages/SystemUI/res/layout/dream_overlay_complication_clock_time.xml +++ b/packages/SystemUI/res/layout/dream_overlay_complication_clock_time.xml @@ -20,7 +20,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:paddingLeft="@dimen/dream_overlay_complication_clock_time_padding_left" - android:fontFamily="sans-serif-thin" + android:fontFamily="@font/clock" android:textColor="@android:color/white" android:format12Hour="h:mm" android:format24Hour="kk:mm" diff --git a/packages/SystemUI/src/com/android/systemui/dreams/complication/dagger/DreamClockTimeComplicationComponent.java b/packages/SystemUI/src/com/android/systemui/dreams/complication/dagger/DreamClockTimeComplicationComponent.java index 053c5b345760e..d539f5c2b870a 100644 --- a/packages/SystemUI/src/com/android/systemui/dreams/complication/dagger/DreamClockTimeComplicationComponent.java +++ b/packages/SystemUI/src/com/android/systemui/dreams/complication/dagger/DreamClockTimeComplicationComponent.java @@ -22,6 +22,7 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.widget.TextClock; import com.android.internal.util.Preconditions; import com.android.systemui.R; @@ -78,6 +79,8 @@ public interface DreamClockTimeComplicationComponent { "clock_time_complication_layout_params"; // Order weight of insert into parent container int INSERT_ORDER_WEIGHT = 0; + String TAG_WEIGHT = "'wght' "; + int WEIGHT = 200; /** * Provides the complication view. @@ -86,10 +89,12 @@ public interface DreamClockTimeComplicationComponent { @DreamClockTimeComplicationScope @Named(DREAM_CLOCK_TIME_COMPLICATION_VIEW) static View provideComplicationView(LayoutInflater layoutInflater) { - return Preconditions.checkNotNull( - layoutInflater.inflate(R.layout.dream_overlay_complication_clock_time, - null, false), + final TextClock view = Preconditions.checkNotNull((TextClock) + layoutInflater.inflate(R.layout.dream_overlay_complication_clock_time, + null, false), "R.layout.dream_overlay_complication_clock_time did not properly inflated"); + view.setFontVariationSettings(TAG_WEIGHT + WEIGHT); + return view; } /**