Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Nadia Benbernou
2019-02-28 15:32:49 +00:00
committed by Android (Google) Code Review
parent cfcaccfc72 8c835785c3
commit 95a502d633
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/SystemUI/res/layout/notification_info.xml
View File

@@ -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>

4
packages/SystemUI/res/values/strings.xml
View File

@@ -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] -->