PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix text styling for choose pattern/password screens" into sc-dev am: 66a2f625e4 am: 67518dac5e

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

Change-Id: I3622d3052417195efe95062d392dc2591113d6d6
This commit is contained in:
TreeHugger Robot
2021-08-05 00:13:48 +00:00
committed by Automerger Merge Worker
parent 2601dcc0c5 67518dac5e
commit 2f0e7869c3
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/layout/choose_lock_pattern_common.xml
View File

@@ -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"

12
res/layout/redaction_interstitial.xml
View File

@@ -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>