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

Commit a2a3ffd4 authored by Fabian Kozynski's avatar Fabian Kozynski
Browse files

Notification fontFamily set to Google Sans 

This change should only affect Pixel devices

Test: Visual
Bug: 117672345
Change-Id: I426c99f5ba77b452d5cef5edbbd3e4ca7a55206c
parent 82b6b06f

core/res/res/layout/notification_material_reply_text.xml

+3 −3
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 
            android:layout_height="wrap_content"

            android:layout_marginEnd="@dimen/notification_content_margin_end"

            android:visibility="gone"

            android:textAppearance="@style/TextAppearance.Material.Notification.Reply"

            android:textAppearance="@style/TextAppearance.DeviceDefault.Notification.Reply"

            android:singleLine="true" />



    <TextView
@@ -48,7 +48,7 @@ 
            android:layout_height="wrap_content"

            android:layout_marginEnd="@dimen/notification_content_margin_end"

            android:visibility="gone"

            android:textAppearance="@style/TextAppearance.Material.Notification.Reply"

            android:textAppearance="@style/TextAppearance.DeviceDefault.Notification.Reply"

            android:singleLine="true" />



    <LinearLayout
@@ -64,7 +64,7 @@ 
                android:layout_weight="1"

                android:layout_marginEnd="@dimen/notification_content_margin_end"

                android:layout_gravity="center"

                android:textAppearance="@style/TextAppearance.Material.Notification.Reply"

                android:textAppearance="@style/TextAppearance.DeviceDefault.Notification.Reply"

                android:singleLine="true" />

        <ProgressBar

            android:id="@+id/notification_material_reply_progress"

core/res/res/layout/notification_template_ambient_header.xml

+1 −1
Original line number Diff line number Diff line
@@ -24,5 +24,5 @@ 
    android:layout_height="wrap_content">

    <include

        layout="@layout/notification_template_header"

        android:theme="@style/Theme.Material.Notification.Ambient"/>

        android:theme="@style/Theme.DeviceDefault.Notification.Ambient"/>

</FrameLayout>

core/res/res/layout/notification_template_header.xml

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
<!-- extends ViewGroup -->

<NotificationHeaderView

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:theme="@style/Theme.Material.Notification"

    android:theme="@style/Theme.DeviceDefault.Notification"

    android:id="@+id/notification_header"

    android:orientation="horizontal"

    android:layout_width="wrap_content"

core/res/res/layout/notification_template_material_ambient.xml

+3 −4
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
    android:paddingEnd="@dimen/notification_extra_margin_ambient"

    >

    <include layout="@layout/notification_template_ambient_header"

             android:theme="@style/Theme.Material.Notification.Ambient" />

             android:theme="@style/Theme.DeviceDefault.Notification.Ambient" />



    <LinearLayout

            android:id="@+id/notification_action_list_margin_target"
@@ -51,8 +51,7 @@ 
            android:orientation="vertical"

            >

            <TextView android:id="@+id/title"

                android:textAppearance="@style/TextAppearance.Material.Notification.Title"

                android:fontFamily="sans-serif"

                android:textAppearance="@style/TextAppearance.DeviceDefault.Notification.Title"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:gravity="top|center_horizontal"
@@ -65,7 +64,7 @@ 
            <TextView android:id="@+id/text"

                android:layout_width="match_parent"

                android:layout_height="0dp"

                android:textAppearance="@style/TextAppearance.Material.Notification"

                android:textAppearance="@style/TextAppearance.DeviceDefault.Notification"

                android:singleLine="false"

                android:layout_weight="1"

                android:gravity="top|center_horizontal"

core/res/res/layout/notification_template_material_big_text.xml

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ 
                android:layout_marginTop="@dimen/notification_progress_margin_top"

                android:layout_marginBottom="6dp"/>

            <com.android.internal.widget.ImageFloatingTextView android:id="@+id/big_text"

                style="@style/Widget.Material.Notification.Text"

                style="@style/Widget.DeviceDefault.Notification.Text"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:layout_marginTop="@dimen/notification_text_margin_top"