Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 26aa201d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: Ifb9bdfac1eae934d032f62cc5d0ec57abe61e0b9
parents e098b857 66a2f625

res/layout/choose_lock_pattern_common.xml

+2 −1
Original line number Diff line number Diff line
@@ -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

+9 −3
Original line number Diff line number Diff line
@@ -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>