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

Commit 1613d883 authored by Julia Reynolds's avatar Julia Reynolds Committed by Android (Google) Code Review
Browse files

Merge "Importance preference updates" into qt-dev

parents 7707133e 090e67d9

res/drawable/button_border_selected.xml

+2 −2
Original line number Diff line number Diff line
@@ -18,6 +18,6 @@ 
       android:shape="rectangle">

    <stroke

        android:width="2dp"

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

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

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

</shape>

res/drawable/button_border_unselected.xml

+2 −2
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
       android:shape="rectangle">

    <stroke

        android:width="2dp"

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

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



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

</shape>

res/layout/notif_importance_preference.xml

+80 −41
Original line number Diff line number Diff line
@@ -21,53 +21,92 @@ 
    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:gravity="center"

    android:padding="@dimen/notification_importance_toggle_marginTop"

    android:orientation="vertical">



    <LinearLayout

        android:id="@+id/buttons"

    <RelativeLayout

        android:id="@+id/alert"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_marginTop="@dimen/notification_importance_toggle_marginTop"

        android:orientation="horizontal"

        android:gravity="center">



            <Button

                android:id="@+id/alert"

        android:padding="@dimen/notification_importance_button_padding"

        android:clickable="true"

        android:focusable="true">

        <ImageView

            android:id="@+id/alert_icon"

            android:src="@drawable/ic_notification_alert"

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

            android:layout_gravity="center"

            android:layout_width="wrap_content"

                android:layout_height="@dimen/notification_importance_toggle_size"

                android:minWidth="@dimen/notification_importance_button_width"

                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_alert"

            android:layout_height="wrap_content"

            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: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_silence"

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

            android:layout_gravity="center"

            android:layout_width="wrap_content"

                android:layout_height="@dimen/notification_importance_toggle_size"

                android:minWidth="@dimen/notification_importance_button_width"

                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_silence"

            android:layout_height="wrap_content"

            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:layout_marginBottom="@dimen/notification_importance_toggle_marginBottom"

        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>
 
 No newline at end of file

res/values/dimens.xml

+1 −0
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ 
    <dimen name="notification_importance_description_padding">20dp</dimen>

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

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

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



    <dimen name="zen_schedule_rule_checkbox_padding">7dp</dimen>

    <dimen name="zen_schedule_day_margin">17dp</dimen>

res/values/strings.xml

+13 −13
Original line number Diff line number Diff line
@@ -7805,7 +7805,7 @@ 
    <string name="profile_section_header">Work notifications</string>









    <!-- Configure Notifications: section header for prioritizer settings  [CHAR LIMIT=80] -->









    <string name="smart_notifications_title">Smart notifications</string>









    <string name="smart_notifications_title">Adaptive notifications</string>

















    <!-- Configure Notifications: setting title [CHAR LIMIT=80] -->









    <string name="asst_capability_prioritizer_title">Automatic Prioritization</string>








@@ -7976,25 +7976,25 @@















    <!-- Channel summaries for the app notification page -->

















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









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









    <string name="notification_channel_summary_min">In the pull-down shade, collapse notifications to one line</string>

















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









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









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









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

















    <!-- [CHAR LIMIT=100] 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>









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









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

















    <!-- [CHAR LIMIT=100] 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>









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









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

















    <!-- [CHAR LIMIT=100] 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>









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









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

















    <!-- [CHAR LIMIT=100] 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>









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









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

















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









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









    <string name="notification_channel_summary_high">When device is unlocked, show notifications as a banner across the top of the screen</string>

















    <!-- [CHAR LIMIT=100] Label for on/off toggle -->