commit 66a2f625e43c91103cd291b64c74d52892357f84
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Aug 04 23:44:35 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Aug 04 23:44:35 2021 +0000
tree 87d5e87401b2c736b3db824182f91e8ed3904c05
parent 831d1153e987e829232ef44a10f69aae778042fd
parent 6ee789e380c496d3febf4e4c132412291a9d9532

Merge "Fix text styling for choose pattern/password screens" into sc-dev

res/layout/choose_lock_pattern_common.xml

diff --git a/res/layout/choose_lock_pattern_common.xml b/res/layout/choose_lock_pattern_common.xml
index b238d93..9ac8fe2 100644
--- a/res/layout/choose_lock_pattern_common.xml
+++ b/res/layout/choose_lock_pattern_common.xml
@@ -44,7 +44,8 @@
             android:minLines="2"
             android:gravity="center"
             android:paddingStart="?attr/sudMarginStart"
-            android:paddingEnd="?attr/sudMarginEnd"/>
+            android:paddingEnd="?attr/sudMarginEnd"
+            android:fontFamily="@*android:string/config_headlineFontFamily" />
 
         <com.google.android.setupdesign.view.FillContentLayout
             style="@style/LockPatternContainerStyle"

res/layout/redaction_interstitial.xml

diff --git a/res/layout/redaction_interstitial.xml b/res/layout/redaction_interstitial.xml
index 0ad8b4d..7deb81c 100644
--- a/res/layout/redaction_interstitial.xml
+++ b/res/layout/redaction_interstitial.xml
@@ -53,7 +53,9 @@
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="0dp"
                 android:minHeight="?android:attr/listPreferredItemHeight"
-                android:text="@string/lock_screen_notifications_summary_show" />
+                android:text="@string/lock_screen_notifications_summary_show"
+                android:textColor="?android:attr/textColorSecondary"
+                android:fontFamily="@*android:string/config_headlineFontFamily" />
 
             <com.android.settings.RestrictedRadioButton
                 android:id="@+id/redact_sensitive"
@@ -62,7 +64,9 @@
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="0dp"
                 android:minHeight="?android:attr/listPreferredItemHeight"
-                android:text="@string/lock_screen_notifications_summary_hide" />
+                android:text="@string/lock_screen_notifications_summary_hide"
+                android:textColor="?android:attr/textColorSecondary"
+                android:fontFamily="@*android:string/config_headlineFontFamily" />
 
             <RadioButton
                 android:id="@+id/hide_all"
@@ -71,7 +75,9 @@
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="0dp"
                 android:minHeight="?android:attr/listPreferredItemHeight"
-                android:text="@string/lock_screen_notifications_summary_disable" />
+                android:text="@string/lock_screen_notifications_summary_disable"
+                android:textColor="?android:attr/textColorSecondary"
+                android:fontFamily="@*android:string/config_headlineFontFamily" />
 
         </RadioGroup>