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

Commit 1bfd350e authored by Jonathan Miranda's avatar Jonathan Miranda Committed by Android (Google) Code Review
Browse files

Merge "Update notification popup UI." into sc-dev

parents dd19a247 313b2c2d

res/drawable/notification_circle.xml

0 → 100644
+11 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<shape

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

    android:shape="oval">



    <solid android:color="?attr/popupNotificationDotColor"/>



    <size

        android:width="@dimen/notification_circle_icon_size"

        android:height="@dimen/notification_circle_icon_size"/>

</shape>
 
 No newline at end of file

res/layout/notification_content.xml

+25 −52
Original line number Diff line number Diff line
@@ -23,35 +23,36 @@ 
    <FrameLayout

        android:id="@+id/header"

        android:layout_width="match_parent"

        android:layout_height="@dimen/notification_header_height"

        android:paddingEnd="@dimen/notification_padding_end"

        android:paddingStart="@dimen/notification_padding_start">

        android:layout_height="wrap_content"

        android:paddingEnd="@dimen/notification_padding"

        android:paddingStart="@dimen/notification_padding">

        <TextView

            android:id="@+id/notification_text"

            android:paddingTop="@dimen/notification_padding"

            android:layout_width="wrap_content"

            android:layout_height="match_parent"

            android:layout_gravity="start"

            android:gravity="center_vertical"

            android:layout_height="wrap_content"

            android:layout_gravity="bottom|start"

            android:text="@string/notifications_header"

            android:textColor="?android:attr/textColorPrimary"

            android:textSize="@dimen/notification_header_text_size" />

            android:textSize="@dimen/notification_header_text_size"

            style="@style/TextHeadline"/>

        <TextView

            android:id="@+id/notification_count"

            android:layout_width="@dimen/notification_icon_size"

            android:layout_height="match_parent"

            android:layout_gravity="end"

            android:fontFamily="sans-serif-medium"

            android:layout_width="@dimen/notification_circle_icon_size"

            android:layout_height="@dimen/notification_circle_icon_size"

            android:background="@drawable/notification_circle"

            android:layout_gravity="bottom|end"

            android:gravity="center"

            android:textColor="?android:attr/textColorPrimary"

            android:textSize="@dimen/notification_header_count_text_size" />

            android:textSize="@dimen/notification_header_count_text_size"

            style="@style/TextHeadline"/>

    </FrameLayout>



    <!-- Main view -->

    <com.android.launcher3.notification.NotificationMainView

        android:id="@+id/main_view"

        android:layout_width="match_parent"

        android:layout_height="@dimen/notification_main_height"

        android:background="@drawable/bg_notification_content"

        android:layout_height="wrap_content"

        android:focusable="true" >



        <LinearLayout
@@ -61,28 +62,28 @@ 
            android:background="?attr/popupColorPrimary"

            android:gravity="center_vertical"

            android:orientation="vertical"

            android:paddingBottom="14dp"

            android:paddingEnd="@dimen/notification_main_text_padding_end"

            android:paddingStart="@dimen/notification_padding_start">

            android:paddingTop="@dimen/notification_padding"

            android:paddingBottom="@dimen/notification_padding"

            android:paddingEnd="@dimen/notification_padding"

            android:paddingStart="@dimen/notification_main_text_padding_start">

            <TextView

                android:id="@+id/title"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:ellipsize="end"

                android:fontFamily="sans-serif"

                android:lines="1"

                android:textAlignment="viewStart"

                android:textColor="?android:attr/textColorPrimary"

                android:textSize="@dimen/notification_main_title_size" />

                android:textSize="@dimen/notification_main_title_size"

                style="@style/TextHeadline" />



            <TextView

                android:id="@+id/text"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:ellipsize="end"

                android:fontFamily="sans-serif"

                android:lines="1"

                android:textColor="?android:attr/textColorSecondary"

                android:textColor="?android:attr/textColorPrimary"

                android:textSize="@dimen/notification_main_text_size" />

        </LinearLayout>
@@ -90,37 +91,9 @@ 
            android:id="@+id/popup_item_icon"

            android:layout_width="@dimen/notification_icon_size"

            android:layout_height="@dimen/notification_icon_size"

            android:layout_gravity="center_vertical|end"

            android:layout_marginBottom="7dp"

            android:layout_marginEnd="@dimen/notification_padding_end" />

            android:layout_gravity="start"

            android:layout_marginTop="@dimen/notification_padding"

            android:layout_marginStart="@dimen/notification_icon_padding" />



    </com.android.launcher3.notification.NotificationMainView>



    <!-- Footer -->

    <com.android.launcher3.notification.NotificationFooterLayout

        android:id="@+id/footer"

        android:layout_width="match_parent"

        android:layout_height="@dimen/notification_footer_height"

        android:layout_gravity="center_vertical"

        android:clipChildren="false">



        <LinearLayout

            android:id="@+id/icon_row"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:clipChildren="false"

            android:clipToPadding="false"

            android:gravity="end|center_vertical"

            android:orientation="horizontal"

            android:padding="@dimen/notification_footer_icon_row_padding"/>



        <View

            android:id="@+id/overflow"

            android:layout_width="@dimen/horizontal_ellipsis_size"

            android:layout_height="@dimen/horizontal_ellipsis_size"

            android:layout_gravity="start|center_vertical"

            android:layout_marginStart="@dimen/horizontal_ellipsis_offset"

            android:background="@drawable/horizontal_ellipsis" />



    </com.android.launcher3.notification.NotificationFooterLayout>

</merge>
 
 No newline at end of file

res/values-v31/colors.xml

+3 −0
Original line number Diff line number Diff line
@@ -25,6 +25,9 @@ 
    <color name="popup_color_secondary_dark">@android:color/system_neutral1_900</color>

    <color name="popup_color_tertiary_dark">@android:color/system_neutral2_700</color>



    <color name="popup_notification_dot_light">@android:color/system_accent1_100</color>

    <color name="popup_notification_dot_dark">@android:color/system_accent2_600</color>



    <color name="workspace_text_color_light">@android:color/system_neutral1_0</color>

    <color name="workspace_text_color_dark">@android:color/system_neutral1_1000</color>

res/values/attrs.xml

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
    <attr name="iconOnlyShortcutColor" format="color" />

    <attr name="eduHalfSheetBGColor" format="color" />

    <attr name="overviewScrimColor" format="color" />

    <attr name="popupNotificationDotColor" format="color" />



    <attr name="folderDotColor" format="color" />

    <attr name="folderFillColor" format="color" />

res/values/colors.xml

+3 −0
Original line number Diff line number Diff line
@@ -53,6 +53,9 @@ 
    <color name="popup_color_secondary_dark">#202124</color>

    <color name="popup_color_tertiary_dark">#757575</color> <!-- Gray 600 -->



    <color name="popup_notification_dot_light">#FFF</color>

    <color name="popup_notification_dot_dark">#757575</color>



    <color name="workspace_text_color_light">#FFF</color>

    <color name="workspace_text_color_dark">#FF000000</color>