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

Commit b86668ed authored by Hao Dong's avatar Hao Dong Committed by Android (Google) Code Review
Browse files

Merge "Update some config_bodyFontFamily to correct configs for bp." into main

parents ca066bcd 2cae2c60

packages/SystemUI/res/values-land/styles.xml

+3 −3
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 
    </style>



    <style name="TextAppearance.AuthNonBioCredential.Title">

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

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

        <item name="android:layout_marginTop">6dp</item>

        <item name="android:textSize">36dp</item>

        <item name="android:focusable">true</item>
@@ -47,14 +47,14 @@ 
    </style>



    <style name="TextAppearance.AuthNonBioCredential.Subtitle">

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

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

        <item name="android:layout_marginTop">6dp</item>

        <item name="android:textSize">18sp</item>

        <item name="android:textColor">?androidprv:attr/materialColorOnSurface</item>

    </style>



    <style name="TextAppearance.AuthNonBioCredential.Description">

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

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

        <item name="android:layout_marginTop">6dp</item>

        <item name="android:textSize">18sp</item>

        <item name="android:textColor">?androidprv:attr/materialColorOnSurface</item>

packages/SystemUI/res/values-sw600dp-land/styles.xml

+3 −3
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">



    <style name="TextAppearance.AuthNonBioCredential.Title">

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

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

        <item name="android:layout_marginTop">16dp</item>

        <item name="android:textSize">36sp</item>

        <item name="android:focusable">true</item>
@@ -26,14 +26,14 @@ 
    </style>



    <style name="TextAppearance.AuthNonBioCredential.Subtitle">

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

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

        <item name="android:layout_marginTop">16dp</item>

        <item name="android:textSize">18sp</item>

        <item name="android:textColor">?androidprv:attr/materialColorOnSurface</item>

    </style>



    <style name="TextAppearance.AuthNonBioCredential.Description">

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

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

        <item name="android:layout_marginTop">16dp</item>

        <item name="android:textSize">18sp</item>

        <item name="android:textColor">?androidprv:attr/materialColorOnSurface</item>

packages/SystemUI/res/values-sw600dp-port/styles.xml

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
    </style>



    <style name="TextAppearance.AuthNonBioCredential.Title">

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

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

        <item name="android:layout_marginTop">24dp</item>

        <item name="android:textSize">36sp</item>

        <item name="android:focusable">true</item>

packages/SystemUI/res/values-sw720dp-land/styles.xml

+3 −3
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">



    <style name="TextAppearance.AuthNonBioCredential.Title">

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

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

        <item name="android:layout_marginTop">16dp</item>

        <item name="android:textSize">36sp</item>

        <item name="android:focusable">true</item>
@@ -26,14 +26,14 @@ 
    </style>



    <style name="TextAppearance.AuthNonBioCredential.Subtitle">

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

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

        <item name="android:layout_marginTop">16dp</item>

        <item name="android:textSize">18sp</item>

        <item name="android:textColor">?androidprv:attr/materialColorOnSurface</item>

    </style>



    <style name="TextAppearance.AuthNonBioCredential.Description">

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

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

        <item name="android:layout_marginTop">16dp</item>

        <item name="android:textSize">18sp</item>

        <item name="android:textColor">?androidprv:attr/materialColorOnSurface</item>

packages/SystemUI/res/values-sw720dp-port/styles.xml

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
    </style>



    <style name="TextAppearance.AuthNonBioCredential.Title">

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

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

        <item name="android:layout_marginTop">24dp</item>

        <item name="android:textSize">36sp</item>

        <item name="android:focusable">true</item>