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

Commit 9fb1dae7 authored by Ioana Alexandru's avatar Ioana Alexandru
Browse files

[Notif redesign] Update text appearance of guts buttons 

Bug: 394822197
Bug: 409496809
Flag: android.app.notifications_redesign_fonts
Test: manual
Change-Id: Ifa16890e8c753a6fdc1243eb3cd7964ec807ee36
parent 6a732cea

core/java/android/app/notification.aconfig

+8 −0
Original line number Diff line number Diff line
@@ -26,6 +26,14 @@ flag { 
  bug: "378660052"

}



flag {

  name: "notifications_redesign_fonts"

  namespace: "systemui"

  description: "Notifications Redesign: Update text styles in notification templates"

  bug: "409496809"

  is_fixed_read_only: true

}



# Flag for finalized API: In Nextfood but exported (and therefore must stay).

flag {

  name: "modes_api"

core/res/res/values/dimens.xml

+0 −3
Original line number Diff line number Diff line
@@ -268,9 +268,6 @@ 
     72dp (content margin) - 12dp (action padding) - 4dp (button inset) -->

    <dimen name="notification_2025_actions_margin_start">56dp</dimen>



    <!-- Notification action button text size -->

    <dimen name="notification_2025_action_text_size">16sp</dimen>



    <!-- The margin on the end of most content views (ignores the expander) -->

    <dimen name="notification_content_margin_end">16dp</dimen>

packages/SystemUI/res/layout/notification_2025_info.xml

+2 −3
Original line number Diff line number Diff line
@@ -346,7 +346,6 @@ 
                android:minHeight="@dimen/notification_2025_min_tap_target_size"

                android:maxWidth="200dp"

                style="@style/TextAppearance.NotificationInfo.Button"

                android:textSize="@*android:dimen/notification_2025_action_text_size"

                />

            <TextView

                android:id="@+id/turn_off_notifications"
@@ -364,7 +363,7 @@ 
                app:layout_constraintStart_toEndOf="@id/inline_dismiss"

                app:layout_constraintBaseline_toBaselineOf="@id/inline_dismiss"

                style="@style/TextAppearance.NotificationInfo.Button"

                android:textSize="@*android:dimen/notification_2025_action_text_size"/>

                />

            <TextView

                android:id="@+id/done"

                android:text="@string/inline_ok_button"
@@ -378,7 +377,7 @@ 
                android:minHeight="@dimen/notification_2025_min_tap_target_size"

                android:maxWidth="125dp"

                style="@style/TextAppearance.NotificationInfo.Button"

                android:textSize="@*android:dimen/notification_2025_action_text_size"/>

                />

            <androidx.constraintlayout.helper.widget.Flow

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

packages/SystemUI/res/layout/notification_2025_partial_conversation_info.xml

+3 −3
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ 
                android:paddingTop="8dp"

                android:paddingBottom="@*android:dimen/notification_2025_margin"

                style="@style/TextAppearance.NotificationInfo.Button"

                android:textSize="@*android:dimen/notification_2025_action_text_size"/>

                />

            <TextView

                android:id="@+id/turn_off_notifications"

                android:text="@string/inline_turn_off_notifications"
@@ -160,7 +160,7 @@ 
                android:paddingTop="8dp"

                android:paddingBottom="@*android:dimen/notification_2025_margin"

                style="@style/TextAppearance.NotificationInfo.Button"

                android:textSize="@*android:dimen/notification_2025_action_text_size"/>

                />

            <TextView

                android:id="@+id/done"

                android:text="@string/inline_done_button"
@@ -174,7 +174,7 @@ 
                android:paddingTop="8dp"

                android:paddingBottom="@*android:dimen/notification_2025_margin"

                style="@style/TextAppearance.NotificationInfo.Button"

                android:textSize="@*android:dimen/notification_2025_action_text_size"/>

                />

        </RelativeLayout>



    </LinearLayout>

packages/SystemUI/res/values/styles.xml

+8 −3
Original line number Diff line number Diff line
@@ -759,9 +759,14 @@ 
    </style>



    <style name="TextAppearance.NotificationInfo.Button">

        <item name="android:fontFamily">@*android:string/config_headlineFontFamilyMedium</item>

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

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

        <item name="android:fontFamily" android:featureFlag="android.app.notifications_redesign_fonts">variable-title-small-emphasized</item>

        <item name="android:fontFamily" android:featureFlag="!android.app.notifications_redesign_fonts">@*android:string/config_headlineFontFamilyMedium</item>



        <item name="android:textSize" android:featureFlag="!android.app.notifications_redesign_fonts">14sp</item>



        <item name="android:textColor" android:featureFlag="android.app.notifications_redesign_fonts">@androidprv:color/materialColorPrimary</item>

        <item name="android:textColor" android:featureFlag="!android.app.notifications_redesign_fonts">?android:attr/colorAccent</item>



        <item name="android:background">@drawable/btn_borderless_rect</item>

        <item name="android:gravity">center_vertical</item>

        <item name="android:focusable">true</item>