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

Commit 4ec4cf32 authored by Menghan Li's avatar Menghan Li Committed by Android (Google) Code Review
Browse files

Merge "[Material Next] Typography for font style" into sc-dev

parents 37d6d083 39229a6a

res/layout/palette_listview_item.xml

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

        android:layout_width="match_parent"

        android:layout_height="42dp"

        android:fontFamily="roboto-bold"

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

        android:gravity="center_vertical"

        android:maxLength="20"

        android:paddingLeft="@dimen/accessibility_layout_margin_start_end"

res/values/styles.xml

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

        <item name="android:textSize">20sp</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 name="AccessibilityDialogDescription"
@@ -676,7 +676,6 @@ 
        <item name="android:layout_marginBottom">32dp</item>

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

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

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

    </style>



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

        <item name="android:textSize">16sp</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 name="AccessibilityDialogPermissionDescription"
@@ -694,7 +693,6 @@ 
        <item name="android:layout_height">wrap_content</item>

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

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

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

    </style>



    <style name="AccessibilityDialogButtonBarSpace">