summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Christine Hallstrom <hallstrom@google.com> 2016-09-19 16:53:26 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2016-09-19 16:53:29 +0000
commit5884b9d40c04e3bb0468c5761242508ad2995147 (patch)
tree63ed4e20a7bdda2bdd7a1f1be80dddc0fa522bb0
parent94ca1c75a7d0884c45370aa67e48b74d165f95b9 (diff)
parent876d4b65a1774e979dfbd997356f0defd0673a4c (diff)
Merge "Change layout_height of contentPanel in Wear AlertDialog to wrap_content" into cw-f-dev
-rw-r--r--core/res/res/layout-watch/alert_dialog_material.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/res/res/layout-watch/alert_dialog_material.xml b/core/res/res/layout-watch/alert_dialog_material.xml
index 002dde83cd93..2fe13de2120a 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"