commit 876d4b65a1774e979dfbd997356f0defd0673a4c
author Christine Hallstrom <hallstrom@google.com> Sun Sep 18 11:46:17 2016 -0700
committer Christine Hallstrom <hallstrom@google.com> Sun Sep 18 11:46:17 2016 -0700
tree 325adb3b8837397e6b815494fc1af1785883fde1
parent b4b51ec3c18ecdd25496ce76005c536223870c2d

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

diff --git a/core/res/res/layout-watch/alert_dialog_material.xml b/core/res/res/layout-watch/alert_dialog_material.xml
index 002dde8..2fe13de 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"