commit bdd98ec216899130a5263c96f6830e1095e1b9af
author TreeHugger Robot <treehugger-gerrit@google.com> Tue May 25 14:34:16 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue May 25 14:34:16 2021 +0000
tree 2b554514d7182b49ba9638128329155e2f65f534
parent 2baf80f3a11f237c6373219b9d3a1bb85cba4bed
parent 6974556f9cbd93ff3c4f70a434bffe63f232421b

Merge "Update fonts & colors" into sc-dev

res/layout/conversation_onboarding.xml

diff --git a/res/layout/conversation_onboarding.xml b/res/layout/conversation_onboarding.xml
index 5de2166..5d727f6 100644
--- a/res/layout/conversation_onboarding.xml
+++ b/res/layout/conversation_onboarding.xml
@@ -33,7 +33,7 @@
         android:layout_height="wrap_content"
         android:gravity="center"
         android:textAppearance="?android:attr/textAppearanceMedium"
-        android:textColor="?android:attr/textColorSecondary"
+        android:fontFamily="@*android:string/config_headlineFontFamilyMedium"
         android:layout_marginTop="47dp"
         android:text="@string/conversation_onboarding_title"/>
     <TextView
@@ -41,5 +41,7 @@
         android:layout_height="wrap_content"
         android:gravity="center"
         android:layout_marginTop="24dp"
+        android:textAppearance="?android:attr/textAppearanceSmall"
+        android:textColor="?android:attr/textColorSecondary"
         android:text="@string/conversation_onboarding_summary"/>
 </LinearLayout>

res/layout/notification_history.xml

diff --git a/res/layout/notification_history.xml b/res/layout/notification_history.xml
index 0b0e1d5..557f172 100644
--- a/res/layout/notification_history.xml
+++ b/res/layout/notification_history.xml
@@ -61,6 +61,7 @@
                 android:gravity="center"
                 android:focusable="true"
                 android:textAppearance="?android:attr/textAppearanceMedium"
+                android:fontFamily="@*android:string/config_headlineFontFamilyMedium"
                 android:text="@string/notification_history_off_title_extended" />
 
             <TextView
@@ -74,6 +75,7 @@
                 android:textAlignment="center"
                 android:focusable="true"
                 android:textAppearance="?android:attr/textAppearanceSmall"
+                android:textColor="?android:attr/textColorSecondary"
                 android:text="@string/notification_history_off_summary" />
 
         </LinearLayout>
@@ -105,6 +107,7 @@
                 android:gravity="center"
                 android:focusable="true"
                 android:textAppearance="?android:attr/textAppearanceMedium"
+                android:fontFamily="@*android:string/config_headlineFontFamilyMedium"
                 android:text="@string/history_toggled_on_title" />
 
             <TextView
@@ -119,6 +122,7 @@
                 android:textAlignment="center"
                 android:focusable="true"
                 android:textAppearance="?android:attr/textAppearanceSmall"
+                android:textColor="?android:attr/textColorSecondary"
                 android:text="@string/history_toggled_on_summary" />
         </LinearLayout>