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

Commit 39229a6a authored by menghanli's avatar menghanli
Browse files

[Material Next] Typography for font style 

Set fontFamily with Typography config which follows the rule for font
and supported font family changing in “Style & Wallpaper”.

Bug: 186065669
Test: Manual testing
Change-Id: I8b94a7e643fa72e91519209cbad2e3d65b6c6749
parent f2ec0fbf

res/layout/palette_listview_item.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -23,7 +23,7 @@ 
        android:id="@+id/item_textview"

        android:id="@+id/item_textview"

        android:layout_width="match_parent"

        android:layout_width="match_parent"

        android:layout_height="42dp"

        android:layout_height="42dp"

        android:fontFamily="roboto-bold"

        android:fontFamily="@*android:string/config_headlineFontFamilyMedium"

        android:gravity="center_vertical"

        android:gravity="center_vertical"

        android:maxLength="20"

        android:maxLength="20"

        android:paddingLeft="@dimen/accessibility_layout_margin_start_end"

        android:paddingLeft="@dimen/accessibility_layout_margin_start_end"

res/values/styles.xml

+2 −4
Original line number Original line Diff line number Diff line
@@ -665,7 +665,7 @@ 
        <item name="android:gravity">center</item>

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

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

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

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

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

        <item name="android:fontFamily">google-sans-medium</item>

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

    </style>

    </style>





    <style name="AccessibilityDialogDescription"

    <style name="AccessibilityDialogDescription"
@@ -676,7 +676,6 @@ 
        <item name="android:layout_marginBottom">32dp</item>

        <item name="android:layout_marginBottom">32dp</item>

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

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

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

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

        <item name="android:fontFamily">sans-serif</item>

    </style>

    </style>





    <style name="AccessibilityDialogPermissionTitle"

    <style name="AccessibilityDialogPermissionTitle"
@@ -685,7 +684,7 @@ 
        <item name="android:layout_height">wrap_content</item>

        <item name="android:layout_height">wrap_content</item>

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

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

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

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

        <item name="android:fontFamily">sans-serif</item>

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

    </style>

    </style>





    <style name="AccessibilityDialogPermissionDescription"

    <style name="AccessibilityDialogPermissionDescription"
@@ -694,7 +693,6 @@ 
        <item name="android:layout_height">wrap_content</item>

        <item name="android:layout_height">wrap_content</item>

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

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

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

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

        <item name="android:fontFamily">sans-serif</item>

    </style>

    </style>





    <style name="AccessibilityDialogButtonBarSpace">

    <style name="AccessibilityDialogButtonBarSpace">