commit e697bf3dbcc2f364bfb911c89da7b966018a197c
author Geoffrey Pitsch <gpitsch@google.com> Fri Apr 28 13:56:16 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Apr 28 13:56:16 2017 +0000
tree 1414671e5bbdaba2b2fc9fcf32f31fa6be640a98
parent ecb3d1139d9bbbf48133f6690a6ca94cbe6fbb02
parent 1838ed0e85eb787661135b4206d9385e87fc2f8f

Merge "Fix notification text not wrapping and clipping switch." into oc-dev am: b05beffabc
am: 1838ed0e85

Change-Id: I236a9b3fd8fee09981e2bb65d75f63cc290b9475

packages/SystemUI/res/layout/notification_info.xml

diff --git a/packages/SystemUI/res/layout/notification_info.xml b/packages/SystemUI/res/layout/notification_info.xml
index 0c9858d..6fe00c0 100644
--- a/packages/SystemUI/res/layout/notification_info.xml
+++ b/packages/SystemUI/res/layout/notification_info.xml
@@ -74,8 +74,9 @@
         android:orientation="horizontal">
         <!-- Channel Text -->
         <LinearLayout
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_weight="1"
             android:orientation="vertical">
             <!-- Channel Name -->
             <TextView
@@ -113,7 +114,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="end|center_vertical"
-            android:layout_weight="1"
             android:contentDescription="@string/notification_channel_switch_accessibility"
             android:background="@null" />
     </LinearLayout>