summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Michael Kwan <mkwan@google.com> 2016-10-14 14:01:07 -0700
committer Michael Kwan <mkwan@google.com> 2016-10-14 14:01:07 -0700
commite6c38677a49a74e64f24466e2e4bf15ad5768b64 (patch)
treea61e9ffa846a054b154b0144b7155139a2de5c89
parent2bfef9bd827be49ec850782360ee3335b827d19c (diff)
Fix oversized icons and removed title line limit.
The maxHeight and maxWidth restrictions we not in effect due to a missing adjustViewBounds="true". Fixed the issue by adding the missing attribute. The title limit was originally arbitrarily picked, not removed completely. Bug: 32173774 Change-Id: I4b31824454fec73cec02cb787fe073bde6b69aff
-rw-r--r--core/res/res/layout-notround-watch/alert_dialog_title_material.xml1
-rw-r--r--core/res/res/layout-round-watch/alert_dialog_title_material.xml1
-rw-r--r--core/res/res/values-watch/styles_material.xml2
3 files changed, 3 insertions, 1 deletions
diff --git a/core/res/res/layout-notround-watch/alert_dialog_title_material.xml b/core/res/res/layout-notround-watch/alert_dialog_title_material.xml
index 307c6db91c3a..0ab56f95efbe 100644
--- a/core/res/res/layout-notround-watch/alert_dialog_title_material.xml
+++ b/core/res/res/layout-notround-watch/alert_dialog_title_material.xml
@@ -22,6 +22,7 @@
android:gravity="top|center_horizontal"
android:minHeight="@dimen/alert_dialog_title_height">
<ImageView android:id="@+id/icon"
+ android:adjustViewBounds="true"
android:maxHeight="24dp"
android:maxWidth="24dp"
android:layout_marginTop="8dp"
diff --git a/core/res/res/layout-round-watch/alert_dialog_title_material.xml b/core/res/res/layout-round-watch/alert_dialog_title_material.xml
index 7e71e4180341..e543c9b69390 100644
--- a/core/res/res/layout-round-watch/alert_dialog_title_material.xml
+++ b/core/res/res/layout-round-watch/alert_dialog_title_material.xml
@@ -21,6 +21,7 @@
android:gravity="top|center_horizontal"
android:minHeight="@dimen/alert_dialog_title_height">
<ImageView android:id="@+id/icon"
+ android:adjustViewBounds="true"
android:maxHeight="24dp"
android:maxWidth="24dp"
android:layout_marginTop="12dp"
diff --git a/core/res/res/values-watch/styles_material.xml b/core/res/res/values-watch/styles_material.xml
index 8a080d9c155d..af4207ed4e6f 100644
--- a/core/res/res/values-watch/styles_material.xml
+++ b/core/res/res/values-watch/styles_material.xml
@@ -95,7 +95,7 @@ please see styles_device_defaults.xml.
</style>
<style name="DialogWindowTitle.Material">
- <item name="maxLines">3</item>
+ <item name="maxLines">@empty</item>
<item name="scrollHorizontally">false</item>
<item name="textAppearance">@style/TextAppearance.Material.DialogWindowTitle</item>
<item name="gravity">@integer/config_dialogTextGravity</item>