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

This commit is contained in:
TreeHugger Robot
2021-08-04 23:44:35 +00:00
committed by Android (Google) Code Review
2 changed files with 11 additions and 4 deletions

View File

@@ -44,7 +44,8 @@
android:minLines="2" android:minLines="2"
android:gravity="center" android:gravity="center"
android:paddingStart="?attr/sudMarginStart" android:paddingStart="?attr/sudMarginStart"
android:paddingEnd="?attr/sudMarginEnd"/> android:paddingEnd="?attr/sudMarginEnd"
android:fontFamily="@*android:string/config_headlineFontFamily" />
<com.google.android.setupdesign.view.FillContentLayout <com.google.android.setupdesign.view.FillContentLayout
style="@style/LockPatternContainerStyle" style="@style/LockPatternContainerStyle"

View File

@@ -53,7 +53,9 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="0dp" android:layout_marginBottom="0dp"
android:minHeight="?android:attr/listPreferredItemHeight" 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 <com.android.settings.RestrictedRadioButton
android:id="@+id/redact_sensitive" android:id="@+id/redact_sensitive"
@@ -62,7 +64,9 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="0dp" android:layout_marginBottom="0dp"
android:minHeight="?android:attr/listPreferredItemHeight" 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 <RadioButton
android:id="@+id/hide_all" android:id="@+id/hide_all"
@@ -71,7 +75,9 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="0dp" android:layout_marginBottom="0dp"
android:minHeight="?android:attr/listPreferredItemHeight" 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> </RadioGroup>