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

Commit 95a502d6 authored by Nadia Benbernou's avatar Nadia Benbernou Committed by Android (Google) Code Review
Browse files

Merge "Add maxWidths to text views for blocking helper buttons. Also tighten... 

Merge "Add maxWidths to text views for blocking helper buttons. Also tighten char limits to avoid wrapping when possible."
parents cfcaccfc 8c835785

packages/SystemUI/res/layout/notification_info.xml

+5 −0
Original line number Diff line number Diff line
@@ -178,6 +178,7 @@ asked for it --> 
                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_centerVertical="true"

                android:maxWidth="100dp"

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



            <LinearLayout
@@ -186,6 +187,7 @@ asked for it --> 
                android:layout_height="wrap_content"

                android:layout_centerVertical="true"

                android:layout_alignParentEnd="true"

                android:maxWidth="200dp"

                android:orientation="horizontal">

                <TextView

                    android:id="@+id/deliver_silently"
@@ -195,6 +197,7 @@ asked for it --> 
                    android:layout_centerVertical="true"

                    android:layout_marginStart="@dimen/notification_guts_button_horizontal_spacing"

                    android:paddingRight="24dp"

                    android:maxWidth="125dp"

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

                <TextView

                    android:id="@+id/block"
@@ -203,6 +206,7 @@ asked for it --> 
                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:layout_centerVertical="true"

                    android:maxWidth="75dp"

                    android:layout_marginStart="@dimen/notification_guts_button_horizontal_spacing"

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

                <TextView
@@ -212,6 +216,7 @@ asked for it --> 
                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:layout_centerVertical="true"

                    android:maxWidth="75dp"

                    android:layout_marginStart="@dimen/notification_guts_button_horizontal_spacing"

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

            </LinearLayout>

packages/SystemUI/res/values/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -1579,7 +1579,7 @@ 
    <string name="inline_blocking_helper">You usually dismiss these notifications.

    \nKeep showing them?</string>



    <!-- Notification Inline controls: button to dismiss the blocking helper [CHAR_LIMIT=25] -->

    <!-- Notification Inline controls: button to dismiss the blocking helper [CHAR_LIMIT=20] -->

    <string name="inline_done_button">Done</string>



    <!-- Notification Inline controls: continue receiving notifications prompt, channel level -->
@@ -1588,7 +1588,7 @@ 
    <!-- Notification inline controls: block notifications button [CHAR_LIMIT=25] -->

    <string name="inline_stop_button">Stop notifications</string>



    <!-- Notification inline controls: button to deliver notifications silently from this channel [CHAR_LIMIT=35] -->

    <!-- Notification inline controls: button to deliver notifications silently from this channel [CHAR_LIMIT=30] -->

    <string name="inline_deliver_silently_button">Deliver Silently</string>



    <!-- Notification inline controls: button to block notifications from this channel [CHAR_LIMIT=20] -->