Merge "Fixed size of autofill service icon on Save affordance." into oc-mr1-dev
am: a8c2b36b33
Change-Id: I771b71a9c189c7eeae30524bd155b5e4f94ad681
diff --git a/core/res/res/layout/autofill_save.xml b/core/res/res/layout/autofill_save.xml
index 63675ab..92419c8 100644
--- a/core/res/res/layout/autofill_save.xml
+++ b/core/res/res/layout/autofill_save.xml
@@ -47,7 +47,7 @@
<ImageView
android:id="@+id/autofill_save_icon"
android:layout_width="wrap_content"
- android:layout_height="wrap_content"/>
+ android:layout_height="24sp"/>
<TextView
android:id="@+id/autofill_save_title"
diff --git a/core/res/res/values/dimens.xml b/core/res/res/values/dimens.xml
index 5ee4f78..2c64789 100644
--- a/core/res/res/values/dimens.xml
+++ b/core/res/res/values/dimens.xml
@@ -609,7 +609,11 @@
<!-- Max height of the the autofill save custom subtitle as a fraction of the screen width/height -->
<dimen name="autofill_save_custom_subtitle_max_height">20%</dimen>
- <!-- Max (absolute) dimensions (both width and height) of autofill service icon on autofill save affordance -->
- <dimen name="autofill_save_icon_max_size">100dp</dimen>
+ <!-- Max (absolute) dimensions (both width and height) of autofill service icon on autofill save affordance.
+ NOTE: the actual displayed size might is actually smaller than this and is hardcoded in the
+ autofill_save.xml layout; this dimension is just used to avoid a crash in the UI (if the icon provided
+ by the autofill service metadata is bigger than these dimentionsit will not be displayed).
+ -->
+ <dimen name="autofill_save_icon_max_size">300dp</dimen>
</resources>