Merge "Update the font family for panel slice" into udc-dev am: ea58698850 am: a3a473746c

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21938303

Change-Id: Idc55fa197bdccfc26902fac841a62160200259cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2023-03-14 06:14:37 +00:00
committed by Automerger Merge Worker

View File

@@ -67,7 +67,7 @@
android:maxLines="1" android:maxLines="1"
android:textColor="?android:attr/textColorPrimary" android:textColor="?android:attr/textColorPrimary"
android:textSize="24sp" android:textSize="24sp"
android:fontFamily="sans-serif-reqular"/> android:fontFamily="@*android:string/config_headlineFontFamilyMedium"/>
<TextView <TextView
android:id="@+id/header_subtitle" android:id="@+id/header_subtitle"
@@ -77,7 +77,7 @@
android:maxLines="1" android:maxLines="1"
android:textColor="?android:attr/textColorSecondary" android:textColor="?android:attr/textColorSecondary"
android:textSize="14sp" android:textSize="14sp"
android:fontFamily="sans-serif-reqular" /> android:fontFamily="@*android:string/config_headlineFontFamilyMedium" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
@@ -90,7 +90,7 @@
android:gravity="center" android:gravity="center"
android:textColor="?android:attr/textColorPrimary" android:textColor="?android:attr/textColorPrimary"
android:textSize="24sp" android:textSize="24sp"
android:fontFamily="sans-serif-reqular"/> android:fontFamily="@*android:string/config_headlineFontFamilyMedium"/>
<ProgressBar <ProgressBar
android:id="@+id/progress_bar" android:id="@+id/progress_bar"