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

Commit 75720fac authored by Ibrahim Yilmaz's avatar Ibrahim Yilmaz Committed by Android (Google) Code Review
Browse files

Merge "MetricStyle: Adjust fonts" into main

parents 75c8c44c 424b8273

core/res/res/layout/notification_2025_expanded_metric.xml

+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"

core/res/res/values/styles.xml

+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">