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

Commit 4e500854 authored by Ioana Alexandru's avatar Ioana Alexandru Committed by Android (Google) Code Review
Browse files

Merge "Revert "[Notif redesign] Increase notification title size"" into main

parents 7fd1b808 4cc4b51c

core/java/android/view/NotificationHeaderView.java

+6 −13
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ import android.graphics.Rect; 
import android.graphics.drawable.Drawable;

import android.os.Build;

import android.util.AttributeSet;

import android.util.TypedValue;

import android.widget.FrameLayout;

import android.widget.RelativeLayout;

import android.widget.RemoteViews;
@@ -266,20 +265,14 @@ public class NotificationHeaderView extends RelativeLayout { 
                ? R.style.TextAppearance_DeviceDefault_Notification_Title

                : R.style.TextAppearance_DeviceDefault_Notification_Info;

        // Most of the time, we're showing text in the minimized state

        if (findViewById(R.id.header_text) instanceof TextView headerText) {

            headerText.setTextAppearance(styleResId);

            if (notificationsRedesignTemplates()) {

                // TODO: b/378660052 - When inlining the redesign flag, this should be updated

                //  directly in TextAppearance_DeviceDefault_Notification_Title so we won't need to

                //  override it here.

                float textSize = getContext().getResources().getDimension(

                        R.dimen.notification_2025_title_text_size);

                headerText.setTextSize(TypedValue.COMPLEX_UNIT_PX, textSize);

            }

        View headerText = findViewById(R.id.header_text);

        if (headerText instanceof TextView) {

            ((TextView) headerText).setTextAppearance(styleResId);

        }

        // If there's no summary or text, we show the app name instead of nothing

        if (findViewById(R.id.app_name_text) instanceof TextView appNameText) {

            appNameText.setTextAppearance(styleResId);

        View appNameText = findViewById(R.id.app_name_text);

        if (appNameText instanceof TextView) {

            ((TextView) appNameText).setTextAppearance(styleResId);

        }

    }

core/res/res/layout/notification_2025_conversation_header.xml

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

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

        android:textSize="@dimen/notification_2025_title_text_size"

        android:textSize="16sp"

        android:singleLine="true"

        android:layout_weight="1"

        />

core/res/res/layout/notification_2025_template_collapsed_base.xml

+0 −1
Original line number Diff line number Diff line
@@ -102,7 +102,6 @@ 
                    android:singleLine="true"

                    android:textAlignment="viewStart"

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

                    android:textSize="@dimen/notification_2025_title_text_size"

                    />



                <include layout="@layout/notification_2025_top_line_views" />

core/res/res/layout/notification_2025_template_collapsed_media.xml

+0 −1
Original line number Diff line number Diff line
@@ -104,7 +104,6 @@ 
                    android:singleLine="true"

                    android:textAlignment="viewStart"

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

                    android:textSize="@dimen/notification_2025_title_text_size"

                    />



                <include layout="@layout/notification_2025_top_line_views" />

core/res/res/layout/notification_2025_template_collapsed_messaging.xml

+0 −1
Original line number Diff line number Diff line
@@ -130,7 +130,6 @@ 
                            android:singleLine="true"

                            android:textAlignment="viewStart"

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

                            android:textSize="@dimen/notification_2025_title_text_size"

                            />



                        <include layout="@layout/notification_2025_top_line_views" />