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

Commit 7d6fdc88 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[Notif redesign] Update notification importance preferences" into main

parents 3ae9355d 7d7ae98d

res/drawable/notification_importance_button_background_selected.xml

+18 −1
Original line number Diff line number Diff line
@@ -15,11 +15,28 @@ 
  limitations under the License.

  -->

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

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

       android:shape="rectangle">

    <solid

        android:featureFlag="android.app.notifications_redesign_fonts"

        android:color="@androidprv:color/materialColorSecondaryContainer"/>

    <solid

        android:featureFlag="!android.app.notifications_redesign_fonts"

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



    <stroke

        android:width="1dp"

        android:featureFlag="android.app.notifications_redesign_fonts"

        android:color="@androidprv:color/materialColorOutline"/>

    <stroke

        android:width="1dp"

        android:featureFlag="!android.app.notifications_redesign_fonts"

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

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



    <corners

        android:featureFlag="android.app.notifications_redesign_fonts"

        android:radius="28dp" />

    <corners

        android:featureFlag="!android.app.notifications_redesign_fonts"

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

</shape>

res/drawable/notification_importance_button_background_unselected.xml

+14 −1
Original line number Diff line number Diff line
@@ -15,11 +15,24 @@ 
  limitations under the License.

  -->

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

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

       android:shape="rectangle">

    <solid

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



    <stroke

        android:width="1dp"

        android:featureFlag="android.app.notifications_redesign_fonts"

        android:color="@androidprv:color/materialColorOutlineVariant"/>

    <stroke

        android:width="1dp"

        android:featureFlag="!android.app.notifications_redesign_fonts"

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

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



    <corners

        android:featureFlag="android.app.notifications_redesign_fonts"

        android:radius="16dp" />

    <corners

        android:featureFlag="!android.app.notifications_redesign_fonts"

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

</shape>

res/layout/notification_2025_importance_preference.xml

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

<!--

  Copyright (C) 2025 The Android Open Source Project



  Licensed under the Apache License, Version 2.0 (the "License");

  you may not use this file except in compliance with the License.

  You may obtain a copy of the License at



       http://www.apache.org/licenses/LICENSE-2.0



  Unless required by applicable law or agreed to in writing, software

  distributed under the License is distributed on an "AS IS" BASIS,

  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  See the License for the specific language governing permissions and

  limitations under the License.

  -->



<LinearLayout

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

    android:id="@+id/app_entities_header"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:gravity="center"

    android:paddingStart="?android:attr/listPreferredItemPaddingStart"

    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"

    android:paddingTop="@dimen/notification_importance_toggle_marginTop"

    android:paddingBottom="@dimen/notification_importance_toggle_marginTop"

    android:orientation="vertical">



    <com.android.settings.notification.NotificationButtonRelativeLayout

        android:id="@+id/alert"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:padding="@dimen/notification_importance_button_padding"

        android:clickable="true"

        android:focusable="true">

        <ImageView

            android:id="@+id/alert_icon"

            android:src="@drawable/ic_notifications_alert"

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

            android:layout_centerVertical="true"

            android:layout_width="wrap_content"

            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"

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

        <TextView

            android:id="@+id/alert_summary"

            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_toEndOf="@id/alert_icon"

            android:layout_below="@id/alert_label"

            android:layout_marginStart="@dimen/notification_importance_drawable_padding"

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

            android:visibility="gone" />

    </com.android.settings.notification.NotificationButtonRelativeLayout>



    <com.android.settings.notification.NotificationButtonRelativeLayout

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

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

            android:layout_centerVertical="true"

            android:layout_width="wrap_content"

            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"

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

        <TextView

            android:id="@+id/silence_summary"

            android:text="@string/notification_channel_summary_low"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:clickable="false"

            android:focusable="false"

            android:ellipsize="end"

            android:maxLines="2"

            android:layout_toEndOf="@id/silence_icon"

            android:layout_below="@id/silence_label"

            android:layout_marginStart="@dimen/notification_importance_drawable_padding"

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

            android:visibility="gone" />

    </com.android.settings.notification.NotificationButtonRelativeLayout>



</LinearLayout>
 
 No newline at end of file

res/layout/notification_2025_priority_conversation_preference.xml

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

<!--

  Copyright (C) 2025 The Android Open Source Project



  Licensed under the Apache License, Version 2.0 (the "License");

  you may not use this file except in compliance with the License.

  You may obtain a copy of the License at



       http://www.apache.org/licenses/LICENSE-2.0



  Unless required by applicable law or agreed to in writing, software

  distributed under the License is distributed on an "AS IS" BASIS,

  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  See the License for the specific language governing permissions and

  limitations under the License.

  -->



<LinearLayout

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

    android:id="@+id/app_entities_header"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:gravity="center"

    android:paddingStart="?android:attr/listPreferredItemPaddingStart"

    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"

    android:paddingTop="@dimen/notification_importance_toggle_marginTop"

    android:paddingBottom="@dimen/notification_importance_toggle_marginTop"

    android:orientation="vertical">



    <com.android.settings.notification.NotificationButtonRelativeLayout

        android:id="@+id/priority_group"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:padding="@dimen/notification_importance_button_padding"

        android:clickable="true"

        android:focusable="true">

        <ImageView

            android:id="@+id/icon"

            android:src="@drawable/ic_important_outline"

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

            android:layout_centerVertical="true"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:clickable="false"

            android:focusable="false"/>

        <TextView

            android:id="@+id/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/icon"

            android:layout_marginStart="@dimen/notification_importance_drawable_padding"

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

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

        <TextView

            android:id="@+id/summary"

            android:text="@string/notification_channel_summary_priority"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:clickable="false"

            android:focusable="false"

            android:ellipsize="end"

            android:maxLines="4"

            android:layout_toEndOf="@id/icon"

            android:layout_below="@id/label"

            android:layout_marginStart="@dimen/notification_importance_drawable_padding"

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

            android:visibility="gone" />

    </com.android.settings.notification.NotificationButtonRelativeLayout>



    <com.android.settings.notification.NotificationButtonRelativeLayout

        android:id="@+id/alert"

        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/icon"

            android:src="@drawable/ic_notifications_alert"

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

            android:layout_centerVertical="true"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:clickable="false"

            android:focusable="false"/>

        <TextView

            android:id="@+id/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/icon"

            android:layout_marginStart="@dimen/notification_importance_drawable_padding"

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

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

        <TextView

            android:id="@+id/summary"

            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_toEndOf="@id/icon"

            android:layout_below="@id/label"

            android:layout_marginStart="@dimen/notification_importance_drawable_padding"

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

            android:visibility="gone" />

    </com.android.settings.notification.NotificationButtonRelativeLayout>



    <com.android.settings.notification.NotificationButtonRelativeLayout

        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/icon"

            android:src="@drawable/ic_notifications_off_24dp"

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

            android:layout_centerVertical="true"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:clickable="false"

            android:focusable="false"/>

        <TextView

            android:id="@+id/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/icon"

            android:layout_marginStart="@dimen/notification_importance_drawable_padding"

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

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

        <TextView

            android:id="@+id/summary"

            android:text="@string/notification_conversation_summary_low"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:clickable="false"

            android:focusable="false"

            android:ellipsize="end"

            android:maxLines="2"

            android:layout_toEndOf="@id/icon"

            android:layout_below="@id/label"

            android:layout_marginStart="@dimen/notification_importance_drawable_padding"

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

            android:visibility="gone" />

    </com.android.settings.notification.NotificationButtonRelativeLayout>



</LinearLayout>
 
 No newline at end of file

res/values/dimens.xml

+2 −2
Original line number Diff line number Diff line
@@ -42,8 +42,8 @@ 
    <dimen name="ring_progress_bar_thickness">4dp</dimen>



    <dimen name="notification_importance_toggle_marginTop">28dp</dimen>

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

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

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

    <dimen name="notification_importance_drawable_padding">16dp</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>