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

Commit 898fbbe0 authored by Julia Reynolds's avatar Julia Reynolds Committed by android-build-merger
Browse files

Merge "Another guts redesign" into qt-dev am: 69ca6f53 

am: 8065b7f5

Change-Id: I2fc5834d07f9f670b7e23fb6a7093c9b291d4233
parents 9cb2391c 8065b7f5

packages/SystemUI/res/drawable/button_border_selected.xml

+1 −1
Original line number Diff line number Diff line
@@ -20,6 +20,6 @@ 
        android:color="@color/notification_guts_selection_bg" />

    <stroke

        android:width="2dp"

        android:color="?android:attr/colorAccent"/>

        android:color="@color/GM2_grey_300"/>

    <corners android:radius="@dimen/rect_button_radius" />

</shape>
 
 No newline at end of file

packages/SystemUI/res/layout/notification_info.xml

+82 −42
Original line number Diff line number Diff line
@@ -103,7 +103,6 @@ asked for it --> 
        android:id="@+id/channel_info"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_marginBottom="@dimen/notification_guts_button_spacing"

        android:paddingEnd="@*android:dimen/notification_content_margin_end"

        android:gravity="center"

        android:orientation="vertical">
@@ -127,6 +126,7 @@ asked for it --> 
        android:id="@+id/blocking_helper"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_marginTop="@dimen/notification_guts_button_spacing"

        android:layout_marginBottom="@dimen/notification_guts_button_spacing"

        android:paddingEnd="@*android:dimen/notification_content_margin_end"

        android:clipChildren="false"
@@ -216,67 +216,107 @@ asked for it --> 
            android:id="@+id/interruptiveness_settings"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:gravity="center"

            android:orientation="vertical">



            <LinearLayout

                android:id="@+id/buttons"

            <RelativeLayout

                android:id="@+id/alert"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:orientation="horizontal"

                android:gravity="center">



                <Button

                    android:id="@+id/alert"

                    android:minWidth="@dimen/notification_importance_button_width"

                android:padding="@dimen/notification_importance_button_padding"

                android:clickable="true"

                android:focusable="true">

                <ImageView

                    android:id="@+id/alert_icon"

                    android:src="@drawable/ic_notification_interruptive"

                    android:background="@android:color/transparent"

                    android:layout_gravity="center"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:minHeight="@dimen/notification_importance_toggle_size"

                    android:paddingStart="@dimen/notification_importance_button_horiz_padding"

                    android:paddingEnd="@dimen/notification_importance_button_horiz_padding"

                    android:drawablePadding="@dimen/notification_importance_drawable_padding"

                    android:foreground="@drawable/button_ripple_radius"

                    android:drawableLeft="@drawable/ic_notification_interruptive"

                    android:clickable="false"

                    android:focusable="false"/>

                <TextView

                    android:id="@+id/alert_label"

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

                    android:ellipsize="end"

                    android:maxLines="1"

                    android:clickable="false"

                    android:focusable="false"

                    android:layout_toEndOf="@id/alert_icon"

                    android:layout_marginStart="@dimen/notification_importance_drawable_padding"

                    android:textAppearance="@style/TextAppearance.NotificationImportanceButton.Unselected"

                    android:text="@string/notification_alert_title"/>

                <TextView

                    android:id="@+id/alert_summary"

                    android:paddingTop="@dimen/notification_importance_button_padding"

                    android:text="@string/notification_channel_summary_default"

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

                    android:clickable="false"

                    android:focusable="false"

                    android:ellipsize="end"

                    android:maxLines="2"

                    android:layout_below="@id/alert_icon"

                    android:textAppearance="@style/TextAppearance.NotificationImportanceDetail"/>

            </RelativeLayout>



                <Button

            <RelativeLayout

                android:id="@+id/silence"

                    android:minWidth="@dimen/notification_importance_button_width"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:padding="@dimen/notification_importance_button_padding"

                android:layout_marginTop="@dimen/notification_importance_button_separation"

                android:clickable="true"

                android:focusable="true">

                <ImageView

                    android:id="@+id/silence_icon"

                    android:src="@drawable/ic_notification_gentle"

                    android:background="@android:color/transparent"

                    android:layout_gravity="center"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:minHeight="@dimen/notification_importance_toggle_size"

                    android:paddingStart="@dimen/notification_importance_button_horiz_padding"

                    android:paddingEnd="@dimen/notification_importance_button_horiz_padding"

                    android:drawablePadding="@dimen/notification_importance_drawable_padding"

                    android:foreground="@drawable/button_ripple_radius"

                    android:layout_marginStart="@dimen/notification_importance_button_separation"

                    android:drawableLeft="@drawable/ic_notification_gentle"

                    android:clickable="false"

                    android:focusable="false"/>

                <TextView

                    android:id="@+id/silence_label"

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

                    android:ellipsize="end"

                    android:maxLines="1"

                    android:clickable="false"

                    android:focusable="false"

                    android:layout_toEndOf="@id/silence_icon"

                    android:layout_marginStart="@dimen/notification_importance_drawable_padding"

                    android:textAppearance="@style/TextAppearance.NotificationImportanceButton.Unselected"

                    android:text="@string/notification_silence_title"/>

            </LinearLayout>



                <TextView

                android:id="@+id/description"

                    android:id="@+id/silence_summary"

                    android:paddingTop="@dimen/notification_importance_button_padding"

                    android:text="@string/notification_channel_summary_default"

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

                android:text="@string/notification_alert_title"

                android:gravity="center"

                android:layout_marginTop="@dimen/notification_importance_text_marginTop"

                android:paddingStart="@dimen/notification_importance_description_padding"

                android:paddingEnd="@dimen/notification_importance_description_padding"

                    android:clickable="false"

                    android:focusable="false"

                    android:ellipsize="end"

                    android:maxLines="2"

                    android:layout_below="@id/silence_icon"

                    android:textAppearance="@style/TextAppearance.NotificationImportanceDetail"/>

            </RelativeLayout>



        </LinearLayout>



        <RelativeLayout

            android:id="@+id/bottom_buttons"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:paddingTop="@dimen/notification_guts_button_spacing" >

            android:layout_marginTop="@dimen/notification_guts_button_spacing" >

            <TextView

                android:id="@+id/turn_off_notifications"

                android:text="@string/inline_turn_off_notifications"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_alignParentStart="true"

                android:layout_centerVertical="true"

                android:minWidth="@dimen/notification_importance_toggle_size"

                android:minHeight="@dimen/notification_importance_toggle_size"

                android:maxWidth="200dp"
@@ -286,11 +326,11 @@ asked for it --> 
                android:text="@string/inline_ok_button"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_centerVertical="true"

                android:layout_alignParentEnd="true"

                android:gravity="center_vertical|end"

                android:maxWidth="125dp"

                android:minWidth="@dimen/notification_importance_toggle_size"

                android:minHeight="@dimen/notification_importance_toggle_size"

                android:layout_alignParentEnd="true"

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

        </RelativeLayout>

packages/SystemUI/res/values/dimens.xml

+4 −2
Original line number Diff line number Diff line
@@ -212,7 +212,7 @@ 
    <dimen name="notification_guts_option_horizontal_padding">15dp</dimen>



    <!-- The vertical space between items in the alert selections in the inline settings -->

    <dimen name="notification_guts_option_vertical_padding">24dp</dimen>

    <dimen name="notification_guts_option_vertical_padding">20dp</dimen>



    <!-- The vertical space between the alert selections in the inline settings -->

    <dimen name="notification_guts_option_vertical_margin">6dp</dimen>
@@ -226,10 +226,12 @@ 
    <dimen name="notification_importance_button_horiz_padding">28dp</dimen>

    <dimen name="notification_importance_drawable_padding">8dp</dimen>

    <dimen name="notification_importance_description_padding">20dp</dimen>

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

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

    <dimen name="notification_importance_description_text">14sp</dimen>

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

    <dimen name="notification_importance_channel_group_text">14sp</dimen>

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

    <dimen name="notification_importance_button_padding">14dp</dimen>

    <dimen name="rect_button_radius">8dp</dimen>



    <!-- The minimum height for the snackbar shown after the snooze option has been chosen. -->

packages/SystemUI/res/values/strings.xml

+5 −5
Original line number Diff line number Diff line
@@ -1659,19 +1659,19 @@ 
    <string name="notification_alert_title">Prioritized</string>



    <!-- [CHAR LIMIT=150] Notification Importance title: low importance level summary -->

    <string name="notification_channel_summary_low">Always silent. Displays in pull-down shade.</string>

    <string name="notification_channel_summary_low">Helps you focus with notifications only in the pull-down shade. Always silent.</string>



    <!-- [CHAR LIMIT=150] Notification Importance title: low importance level summary -->

    <string name="notification_channel_summary_low_status">Always silent. Displays in pull-down shade &amp; status bar.</string>

    <string name="notification_channel_summary_low_status">Displays below priority notifications. Always silent.</string>



    <!-- [CHAR LIMIT=150] Notification Importance title: low importance level summary -->

    <string name="notification_channel_summary_low_lock">Always silent. Displays in pull-down shade &amp; on lock screen.</string>

    <string name="notification_channel_summary_low_lock">Displays below priority notifications. Always silent.</string>



    <!-- [CHAR LIMIT=150] Notification Importance title: low importance level summary -->

    <string name="notification_channel_summary_low_status_lock">Always silent. Displays in pull-down shade, status bar &amp; on lock screen.</string>

    <string name="notification_channel_summary_low_status_lock">Displays below priority notifications. Always silent.</string>



    <!-- [CHAR LIMIT=150] Notification Importance title: normal importance level summary -->

    <string name="notification_channel_summary_default">Makes sound and displays in pull-down shade, status bar &amp; on lock screen.</string>

    <string name="notification_channel_summary_default">Gets your attention with sound &amp; a status bar icon. Shows on lock screen.</string>



    <!-- Notification: Control panel: Label that displays when the app's notifications cannot be blocked. -->

    <string name="notification_unblockable_desc">These notifications can\'t be modified.</string>

packages/SystemUI/res/values/styles.xml

+1 −1
Original line number Diff line number Diff line
@@ -473,7 +473,7 @@ 
    </style>



    <style name="TextAppearance.NotificationImportanceHeader">

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

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

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

        <item name="android:textColor">@color/notification_guts_header_text_color</item>

    </style>