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

Commit 12a838d1 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Make ActionDisabledByAdminDialog can adopt selected font" into rvc-dev

parents d9dadc05 6436895d

res/layout/admin_support_details_dialog.xml

+2 −2
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
                android:layout_height="wrap_content"

                android:paddingStart="@dimen/admin_details_dialog_padding"

                android:text="@string/disabled_by_policy_title"

                android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Title" />

                android:textAppearance="@style/TextAppearance.HeadLineFontFamily"/>

    </LinearLayout>



    <ScrollView
@@ -48,7 +48,7 @@ 
            <TextView android:id="@+id/admin_support_msg"

                      android:layout_width="match_parent"

                      android:layout_height="wrap_content"

                      android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead"

                      android:textAppearance="@style/TextAppearance.HeadLineFontFamily.Subhead"

                      android:text="@string/default_admin_support_msg"

                      android:maxLength="200"

                      android:autoLink="email|phone|web"

res/values/styles.xml

+10 −0
Original line number Diff line number Diff line
@@ -733,4 +733,14 @@ 
        <item name="android:fontFamily">sans-serif</item>

        <item name="android:gravity">start</item>

    </style>



    <style name="TextAppearance.HeadLineFontFamily"

           parent="@*android:style/TextAppearance.DeviceDefault.Title">

        <item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>

    </style>



    <style name="TextAppearance.HeadLineFontFamily.Subhead"

           parent="@*android:style/TextAppearance.DeviceDefault.Subhead">

        <item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>

    </style>

</resources>