From 876d4b65a1774e979dfbd997356f0defd0673a4c Mon Sep 17 00:00:00 2001
From: Christine Hallstrom <hallstrom@google.com>
Date: Sun, 18 Sep 2016 11:46:17 -0700
Subject: [PATCH] Change layout_height of contentPanel in Wear AlertDialog to
 wrap_content

When layout_height is set to match_parent and message is less than
height of parent, button won't show up.

Bug: 31223165
Change-Id: I4f7376fbf34c57309dcb5223dfc4df16774a82d0
---
 core/res/res/layout-watch/alert_dialog_material.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/res/res/layout-watch/alert_dialog_material.xml b/core/res/res/layout-watch/alert_dialog_material.xml
index 002dde83cd93c..2fe13de2120af 100644
--- a/core/res/res/layout-watch/alert_dialog_material.xml
+++ b/core/res/res/layout-watch/alert_dialog_material.xml
@@ -45,7 +45,7 @@
             <!-- Content Panel -->
             <FrameLayout android:id="@+id/contentPanel"
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent"
+                    android:layout_height="wrap_content"
                     android:clipToPadding="false">
                 <TextView android:id="@+id/message"
                         android:layout_width="match_parent"