summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Adrian Roos <roosa@google.com> 2016-05-20 22:08:35 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2016-05-20 22:08:37 +0000
commitcbfef08990e4d44c723da71f7f7271a72fb10f17 (patch)
tree4a197fcb2a7eef8b640b2f2274cae318b1a80599
parent44fbbfd24857ad0defcaa0ef85c0d5b01cd2250a (diff)
parentf4be9c7a96578f33b3a810c8a5b86458735907f8 (diff)
Merge "Fix cut off actions in messaging style" into nyc-dev
-rw-r--r--core/res/res/layout/notification_template_material_messaging.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/res/res/layout/notification_template_material_messaging.xml b/core/res/res/layout/notification_template_material_messaging.xml
index 7d718e0db991..d95ff056c22a 100644
--- a/core/res/res/layout/notification_template_material_messaging.xml
+++ b/core/res/res/layout/notification_template_material_messaging.xml
@@ -50,7 +50,7 @@
android:layout_height="wrap_content"
android:paddingBottom="@dimen/notification_content_margin_bottom"
android:spacing="@dimen/notification_messaging_spacing"
- android:maxHeight="212dp">
+ android:maxHeight="165dp">
<com.android.internal.widget.ImageFloatingTextView android:id="@+id/inbox_text0"
style="@style/Widget.Material.Notification.MessagingText"
/>