summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2020-05-27 21:48:52 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2020-05-27 21:48:52 +0000
commit09aa3bc4b7c2033af7dffc6e46b3db7aa6224623 (patch)
tree274d08c9da07c6bd95e879e9ab3939d42219714a
parent67be1e7ae75e47a85d26ac067d3bfb352004c8c3 (diff)
parent0412791dc1e1f4b64982e5e4e94adba251f743c3 (diff)
Merge "Fix text direction" into rvc-dev
-rw-r--r--packages/SystemUI/res/layout/notification_conversation_info.xml2
-rw-r--r--packages/SystemUI/res/layout/notification_info.xml3
2 files changed, 4 insertions, 1 deletions
diff --git a/packages/SystemUI/res/layout/notification_conversation_info.xml b/packages/SystemUI/res/layout/notification_conversation_info.xml
index a2221d3d559c..3bd7e04f2094 100644
--- a/packages/SystemUI/res/layout/notification_conversation_info.xml
+++ b/packages/SystemUI/res/layout/notification_conversation_info.xml
@@ -63,6 +63,8 @@
android:id="@+id/parent_channel_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:ellipsize="end"
+ android:textDirection="locale"
android:layout_weight="1"
style="@style/TextAppearance.NotificationImportanceChannel"/>
<TextView
diff --git a/packages/SystemUI/res/layout/notification_info.xml b/packages/SystemUI/res/layout/notification_info.xml
index e8e0133103eb..af5a8f4d3c23 100644
--- a/packages/SystemUI/res/layout/notification_info.xml
+++ b/packages/SystemUI/res/layout/notification_info.xml
@@ -46,7 +46,6 @@
android:layout_weight="1"
android:layout_width="0dp"
android:orientation="vertical"
-
android:layout_height="wrap_content"
android:minHeight="@dimen/notification_guts_conversation_icon_size"
android:layout_centerVertical="true"
@@ -57,6 +56,7 @@
android:id="@+id/channel_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:textDirection="locale"
style="@style/TextAppearance.NotificationImportanceChannel"/>
<LinearLayout
android:layout_width="match_parent"
@@ -84,6 +84,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
+ android:textDirection="locale"
style="@style/TextAppearance.NotificationImportanceChannelGroup"/>
</LinearLayout>
<TextView