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

Commit 424b8273 authored by Ibrahim Yilmaz's avatar Ibrahim Yilmaz
Browse files

MetricStyle: Adjust fonts

This CL adjusts fonts used for Metric label and value.

Bug: 434910979
Flag: android.app.api_metric_style
Test: manual (post a MetricStyle template and see the result)
Change-Id: I70e57eeef2aa7983ee9a8b66b9274dd43b3740af
parent 309b4ce4
Loading
Loading
Loading
Loading
+3 −6
Original line number Diff line number Diff line
@@ -32,8 +32,7 @@
            android:id="@+id/metric_label_0"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:maxLines="1"
            style="@style/Widget.DeviceDefault.Notification.Text"
            style="@style/NotificationExpandedMetricLabel"
            />
        <LinearLayout
            android:layout_width="match_parent"
@@ -73,8 +72,7 @@
            android:id="@+id/metric_label_1"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:maxLines="1"
            style="@style/Widget.DeviceDefault.Notification.Text"
            style="@style/NotificationExpandedMetricLabel"
            />
        <LinearLayout
            android:layout_width="match_parent"
@@ -113,8 +111,7 @@
            android:id="@+id/metric_label_2"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:maxLines="1"
            style="@style/Widget.DeviceDefault.Notification.Text"
            style="@style/NotificationExpandedMetricLabel"
            />
        <LinearLayout
            android:layout_width="match_parent"
+10 −3
Original line number Diff line number Diff line
@@ -1664,25 +1664,32 @@ please see styles_device_defaults.xml.
    <style name="NotificationMetricLabel" parent="Widget.DeviceDefault.Notification.Text">
        <item name="ellipsize">end</item>
        <item name="maxLines">1</item>
        <item name="textSize">14sp</item>
        <item name="fontFamily" android:featureFlag="android.app.notifications_redesign_fonts">variable-body-medium</item>
    </style>

    <!-- @hide -->
    <style name="NotificationMetricValue" parent="Widget.DeviceDefault.Notification.Text">
        <item name="ellipsize">end</item>
        <item name="maxLines">1</item>
        <item name="textSize">14sp</item>
        <item name="fontFamily" android:featureFlag="android.app.notifications_redesign_fonts">variable-body-medium</item>
    </style>

    <!-- @hide -->
    <style name="NotificationMetricUnit" parent="Widget.DeviceDefault.Notification.Text">
        <item name="ellipsize">end</item>
        <item name="maxLines">1</item>
        <item name="fontFamily" android:featureFlag="android.app.notifications_redesign_fonts">variant-title-small-emphasized</item>
        <item name="fontFamily" android:featureFlag="android.app.notifications_redesign_fonts">variable-body-medium</item>
    </style>

    <!-- @hide -->
    <style name="NotificationExpandedMetricLabel" parent="NotificationMetricLabel" />

    <!-- @hide -->
    <style name="NotificationExpandedMetricValue" parent="NotificationMetricValue">
        <item name="textSize">24dp</item>
        <item name="fontFamily" android:featureFlag="android.app.notifications_redesign_fonts">variant-title-small-emphasized</item>
        <item name="textSize">28sp</item>
        <item name="fontFamily" android:featureFlag="android.app.notifications_redesign_fonts">variable-headline-medium-emphasized</item>
    </style>

    <style name="AccessibilityDialog">