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

Commit e10efd8c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Alerting notifications section header + new header style"

parents 10d71243 b0940383

packages/SystemUI/res/layout/people_strip.xml

+16 −27
Original line number Diff line number Diff line
@@ -19,40 +19,35 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="@dimen/notification_section_header_height"

    android:paddingStart="4dp"

    android:paddingEnd="4dp"

    android:focusable="true"

    android:clickable="true"

>



    <com.android.systemui.statusbar.notification.row.NotificationBackgroundView

        android:id="@+id/backgroundNormal"

        android:layout_width="match_parent"

        android:layout_height="match_parent" />



    <com.android.systemui.statusbar.notification.row.NotificationBackgroundView

        android:id="@+id/backgroundDimmed"

        android:layout_width="match_parent"

        android:layout_height="match_parent" />



    <LinearLayout

        android:id="@+id/people_list"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:gravity="center"

        android:layout_marginEnd="8dp"

        android:gravity="bottom"

        android:orientation="horizontal">



        <FrameLayout

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:gravity="start|center_vertical"

            android:layout_weight="1">



            <TextView

                style="@style/TextAppearance.NotificationSectionHeaderButton"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

            android:layout_weight="1"

            android:layout_marginStart="@dimen/notification_section_header_padding_left"

            android:gravity="start"

            android:textAlignment="gravity"

                android:text="@string/notification_section_header_conversations"

            android:textSize="12sp"

            android:textColor="@color/notification_section_header_label_color"

            android:fontFamily="@*android:string/config_headlineFontFamilyMedium"

            />



        </FrameLayout>



        <ImageView

            android:layout_width="48dp"

            android:layout_height="48dp"
@@ -84,16 +79,10 @@ 
        <ImageView

            android:layout_width="48dp"

            android:layout_height="48dp"

            android:layout_marginEnd="8dp"

            android:padding="8dp"

            android:scaleType="fitCenter"

        />



    </LinearLayout>



    <com.android.systemui.statusbar.notification.FakeShadowView

        android:id="@+id/fake_shadow"

        android:layout_width="match_parent"

        android:layout_height="match_parent" />



</com.android.systemui.statusbar.notification.stack.PeopleHubView>

packages/SystemUI/res/layout/status_bar_notification_footer.xml

+5 −6
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
        android:layout_width="match_parent"

        android:layout_height="wrap_content">

        <com.android.systemui.statusbar.notification.row.FooterViewButton

            style="@android:style/Widget.Material.Button.Borderless"

            style="@style/TextAppearance.NotificationSectionHeaderButton"

            android:id="@+id/manage_text"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"
@@ -35,10 +35,9 @@ 
            android:focusable="true"

            android:contentDescription="@string/accessibility_manage_notification"

            android:text="@string/manage_notifications_text"

            android:textColor="?attr/wallpaperTextColor"

            android:textAllCaps="false"/>

        />

        <com.android.systemui.statusbar.notification.row.FooterViewButton

            style="@android:style/Widget.Material.Button.Borderless"

            style="@style/TextAppearance.NotificationSectionHeaderButton"

            android:id="@+id/dismiss_text"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"
@@ -46,6 +45,6 @@ 
            android:focusable="true"

            android:contentDescription="@string/accessibility_clear_all"

            android:text="@string/clear_all_notifications_text"

            android:textColor="?attr/wallpaperTextColor"/>

        />

    </com.android.systemui.statusbar.AlphaOptimizedFrameLayout>

</com.android.systemui.statusbar.notification.row.FooterView>

packages/SystemUI/res/layout/status_bar_notification_section_header.xml

+4 −15
Original line number Diff line number Diff line
@@ -19,32 +19,21 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="@dimen/notification_section_header_height"

    android:paddingStart="4dp"

    android:paddingEnd="4dp"

    android:focusable="true"

    android:clickable="true"

    >



    <com.android.systemui.statusbar.notification.row.NotificationBackgroundView

        android:id="@+id/backgroundNormal"

        android:layout_width="match_parent"

        android:layout_height="match_parent" />

    <com.android.systemui.statusbar.notification.row.NotificationBackgroundView

        android:id="@+id/backgroundDimmed"

        android:layout_width="match_parent"

        android:layout_height="match_parent" />



    <LinearLayout

        android:id="@+id/content"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_height="wrap_content"

        android:layout_gravity="bottom"

        android:gravity="center_vertical"

        android:orientation="horizontal"

        >

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

    </LinearLayout>



    <com.android.systemui.statusbar.notification.FakeShadowView

        android:id="@+id/fake_shadow"

        android:layout_width="match_parent"

        android:layout_height="match_parent" />



</com.android.systemui.statusbar.notification.stack.SectionHeaderView>

packages/SystemUI/res/layout/status_bar_notification_section_header_contents.xml

+18 −14
Original line number Diff line number Diff line
@@ -16,26 +16,30 @@ 


<!-- Used by both status_bar_notification_header and SectionHeaderView -->

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

    <FrameLayout

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:gravity="start|center_vertical"

        android:layout_weight="1">



        <TextView

            style="@style/TextAppearance.NotificationSectionHeaderButton"

            android:id="@+id/header_label"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

        android:layout_weight="1"

        android:layout_marginStart="@dimen/notification_section_header_padding_left"

        android:gravity="start"

        android:textAlignment="gravity"

            android:text="@string/notification_section_header_gentle"

        android:textSize="12sp"

        android:textColor="@color/notification_section_header_label_color"

        android:fontFamily="@*android:string/config_headlineFontFamilyMedium"

        />



    </FrameLayout>

    <ImageView

        android:id="@+id/btn_clear_all"

        android:layout_width="@dimen/notification_section_header_height"

        android:layout_height="@dimen/notification_section_header_height"

        android:layout_marginEnd="4dp"

        android:layout_width="48dp"

        android:layout_height="48dp"

        android:src="@drawable/status_bar_notification_section_header_clear_btn"

        android:contentDescription="@string/accessibility_notification_section_header_gentle_clear_all"

        android:scaleType="center"

        android:tint="?attr/wallpaperTextColor"

        android:tintMode="src_in"

        android:visibility="gone"

    />

</merge>

packages/SystemUI/res/values/dimens.xml

+1 −1
Original line number Diff line number Diff line
@@ -744,7 +744,7 @@ 
    <!-- The top padding of the clear all button -->

    <dimen name="clear_all_padding_top">12dp</dimen>



    <dimen name="notification_section_header_height">48dp</dimen>

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

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



    <!-- Largest size an avatar might need to be drawn in the user picker, status bar, or