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

Commit 9c8900ce authored by Lucas Dupin's avatar Lucas Dupin Committed by android-build-merger
Browse files

Merge "AOD group notification style" into pi-dev 

am: b0e503f9

Change-Id: I03132d8cb4b16e4eec17dc70e2a5a1fcce170729
parents 87be5177 b0e503f9

core/res/res/layout/notification_template_material_ambient.xml

+2 −2
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ 
                android:singleLine="true"

                android:ellipsize="marquee"

                android:fadingEdge="horizontal"

                android:textSize="24sp"

                android:textSize="@dimen/notification_ambient_title_text_size"

                android:textColor="#ffffffff"

            />

            <TextView android:id="@+id/text"
@@ -70,7 +70,7 @@ 
                android:layout_weight="1"

                android:gravity="top|center_horizontal"

                android:visibility="gone"

                android:textSize="16sp"

                android:textSize="@dimen/notification_ambient_text_size"

                android:textColor="#eeffffff"

                android:layout_marginTop="4dp"

                android:ellipsize="end"

core/res/res/values/dimens.xml

+4 −0
Original line number Diff line number Diff line
@@ -374,6 +374,10 @@ 
    <dimen name="notification_title_text_size">14sp</dimen>

    <!-- Size of smaller notification text (see TextAppearance.StatusBar.EventContent.Line2, Info, Time) -->

    <dimen name="notification_subtext_size">12sp</dimen>

    <!-- Size of notification text (see TextAppearance.StatusBar.EventContent) -->

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

    <!-- Size of notification text titles (see TextAppearance.StatusBar.EventContent.Title) -->

    <dimen name="notification_ambient_title_text_size">24sp</dimen>



    <!-- Top padding for notifications in the standard layout. -->

    <dimen name="notification_top_pad">10dp</dimen>

packages/SystemUI/res/layout/hybrid_notification.xml

+0 −1
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ 
        android:id="@+id/notification_title"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

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

        android:singleLine="true"

        style="?attr/hybridNotificationTitleStyle"

    />

packages/SystemUI/res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -623,6 +623,8 @@ 


    <!-- The overflow indicator shown when a group has more notification inside the group than the visible ones. An example is "+ 3" [CHAR LIMIT=5] -->

    <string name="notification_group_overflow_indicator">+ <xliff:g id="number" example="3">%s</xliff:g></string>

    <!-- The overflow indicator shown when a group has more notification inside the group than the visible ones. An example is "New message, +3" [CHAR LIMIT=7] -->

    <string name="notification_group_overflow_indicator_ambient"><xliff:g id="notification_title" example="New message">%s</xliff:g>, +<xliff:g id="overflow" example="+3">%s</xliff:g></string>



    <!-- Content description describing how many more notifications are in a group [CHAR LIMIT=NONE] -->

    <plurals name="notification_group_overflow_description">

packages/SystemUI/res/values/styles.xml

+9 −4
Original line number Diff line number Diff line
@@ -110,7 +110,6 @@ 
        <item name="android:paddingStart">@*android:dimen/notification_extra_margin_ambient</item>

        <item name="android:paddingEnd">@*android:dimen/notification_extra_margin_ambient</item>

        <item name="android:orientation">vertical</item>

        <item name="android:paddingBottom">23.5dp</item>

    </style>



    <style name="hybrid_notification">
@@ -119,22 +118,28 @@ 
    </style>



    <style name="hybrid_notification_title_ambient">

        <item name="android:layout_marginTop">@*android:dimen/notification_header_margin_top_ambient</item>

        <item name="android:paddingStart">@*android:dimen/notification_content_margin_start</item>

        <item name="android:paddingEnd">@*android:dimen/notification_content_margin_end</item>

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

        <item name="android:textAppearance">@*android:style/Notification.Header.Ambient</item>

        <item name="android:layout_gravity">top|center_horizontal</item>

        <item name="android:textSize">@*android:dimen/notification_ambient_title_text_size</item>

        <item name="android:textColor">#ffffffff</item>

    </style>



    <style name="hybrid_notification_title">

        <item name="android:paddingEnd">4dp</item>

        <item name="android:textAppearance">@*android:style/TextAppearance.Material.Notification.Title</item>

    </style>



    <style name="hybrid_notification_text_ambient">

        <item name="android:paddingStart">@*android:dimen/notification_content_margin_start</item>

        <item name="android:paddingEnd">@*android:dimen/notification_content_margin_end</item>

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

        <item name="android:textSize">@*android:dimen/notification_ambient_text_size</item>

        <item name="android:textColor">#eeffffff</item>

        <item name="android:layout_marginTop">4dp</item>

        <item name="android:gravity">top|center_horizontal</item>

        <item name="android:ellipsize">end</item>

        <item name="android:maxLines">3</item>

    </style>



    <style name="hybrid_notification_text"