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

Commit 17757a96 authored by Mariia Sandrikova's avatar Mariia Sandrikova Committed by Android (Google) Code Review
Browse files

Merge "Vertically center notification priority labels."

parents 168f468c b74bf962

res/layout/notif_priority_conversation_preference.xml

+74 −60
Original line number Diff line number Diff line
@@ -31,11 +31,16 @@ 
        android:padding="@dimen/notification_importance_button_padding"

        android:clickable="true"

        android:focusable="true">

        <LinearLayout

            android:id="@+id/icon_label_container"

            android:gravity="center_vertical"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:orientation="horizontal">

            <ImageView

                android:id="@+id/icon"

                android:src="@drawable/ic_important_outline"

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

            android:layout_gravity="center"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:clickable="false"
@@ -48,10 +53,10 @@ 
                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.Unselected"

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

        </LinearLayout>

        <TextView

            android:id="@+id/summary"

            android:paddingTop="@dimen/notification_importance_button_padding"
@@ -62,7 +67,6 @@ 
            android:focusable="false"

            android:ellipsize="end"

            android:maxLines="4"

            android:layout_below="@id/icon"

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

            android:visibility="gone" />

    </com.android.settings.notification.NotificationButtonRelativeLayout>
@@ -75,11 +79,16 @@ 
        android:layout_marginTop="@dimen/notification_importance_button_separation"

        android:clickable="true"

        android:focusable="true">

        <LinearLayout

            android:id="@+id/icon_label_container"

            android:gravity="center_vertical"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:orientation="horizontal">

            <ImageView

                android:id="@+id/icon"

                android:src="@drawable/ic_notifications_alert"

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

            android:layout_gravity="center"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:clickable="false"
@@ -92,10 +101,10 @@ 
                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.Unselected"

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

        </LinearLayout>

        <TextView

            android:id="@+id/summary"

            android:paddingTop="@dimen/notification_importance_button_padding"
@@ -106,7 +115,7 @@ 
            android:focusable="false"

            android:ellipsize="end"

            android:maxLines="2"

            android:layout_below="@id/icon"

            android:layout_below="@id/icon_label_container"

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

            android:visibility="gone" />

    </com.android.settings.notification.NotificationButtonRelativeLayout>
@@ -119,11 +128,16 @@ 
        android:layout_marginTop="@dimen/notification_importance_button_separation"

        android:clickable="true"

        android:focusable="true">

        <LinearLayout

            android:id="@+id/icon_label_container"

            android:gravity="center_vertical"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:orientation="horizontal">

            <ImageView

                android:id="@+id/icon"

                android:src="@drawable/ic_notifications_off_24dp"

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

            android:layout_gravity="center"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:clickable="false"
@@ -136,10 +150,10 @@ 
                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.Unselected"

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

        </LinearLayout>

        <TextView

            android:id="@+id/summary"

            android:paddingTop="@dimen/notification_importance_button_padding"
@@ -150,7 +164,7 @@ 
            android:focusable="false"

            android:ellipsize="end"

            android:maxLines="2"

            android:layout_below="@id/icon"

            android:layout_below="@id/icon_label_container"

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

            android:visibility="gone" />

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