Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix oversized icons and removed title line limit." into cw-f-dev

Browse Source
This commit is contained in:
Michael Kwan
2016-10-17 23:14:04 +00:00
committed by Android (Google) Code Review
parent c6577b1266 e6c38677a4
commit ff2d91fa07
3 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/res/res/layout-notround-watch/alert_dialog_title_material.xml
View File

@@ -22,6 +22,7 @@
android:gravity="top|center_horizontal" android:gravity="top|center_horizontal"
android:minHeight="@dimen/alert_dialog_title_height"> android:minHeight="@dimen/alert_dialog_title_height">
<ImageView android:id="@+id/icon" <ImageView android:id="@+id/icon"
android:adjustViewBounds="true"
android:maxHeight="24dp" android:maxHeight="24dp"
android:maxWidth="24dp" android:maxWidth="24dp"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"

1
core/res/res/layout-round-watch/alert_dialog_title_material.xml
View File

@@ -21,6 +21,7 @@
android:gravity="top|center_horizontal" android:gravity="top|center_horizontal"
android:minHeight="@dimen/alert_dialog_title_height"> android:minHeight="@dimen/alert_dialog_title_height">
<ImageView android:id="@+id/icon" <ImageView android:id="@+id/icon"
android:adjustViewBounds="true"
android:maxHeight="24dp" android:maxHeight="24dp"
android:maxWidth="24dp" android:maxWidth="24dp"
android:layout_marginTop="12dp" android:layout_marginTop="12dp"

2
core/res/res/values-watch/styles_material.xml
View File

@@ -95,7 +95,7 @@ please see styles_device_defaults.xml.
</style> </style>
<style name="DialogWindowTitle.Material"> <style name="DialogWindowTitle.Material">
<item name="maxLines">3</item> <item name="maxLines">@empty</item>
<item name="scrollHorizontally">false</item> <item name="scrollHorizontally">false</item>
<item name="textAppearance">@style/TextAppearance.Material.DialogWindowTitle</item> <item name="textAppearance">@style/TextAppearance.Material.DialogWindowTitle</item>
<item name="gravity">@integer/config_dialogTextGravity</item> <item name="gravity">@integer/config_dialogTextGravity</item>