From a53014baeb572ee9327da080e467febaf83ca61d Mon Sep 17 00:00:00 2001
From: markwei <markwei@google.com>
Date: Thu, 14 Sep 2017 20:46:20 -0400
Subject: [PATCH] Parameterize FAB's maxImageSize.

PiperOrigin-RevId: 168774497
---
 lib/res/values/attrs.xml                                       | 2 ++
 lib/res/values/styles.xml                                      | 1 +
 .../android/support/design/widget/FloatingActionButton.java    | 3 +--
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/res/values/attrs.xml b/lib/res/values/attrs.xml
index 4958e08f9..e7261b386 100644
--- a/lib/res/values/attrs.xml
+++ b/lib/res/values/attrs.xml
@@ -81,6 +81,8 @@
     <attr name="borderWidth" format="dimension"/>
     <!-- Enable compat padding. -->
     <attr name="useCompatPadding" format="boolean"/>
+    <!-- Maximum icon image size. -->
+    <attr name="maxImageSize" format="dimension"/>
   </declare-styleable>
 
   <declare-styleable name="FloatingActionButton_Behavior_Layout">
diff --git a/lib/res/values/styles.xml b/lib/res/values/styles.xml
index a409fc278..ce22b1579 100644
--- a/lib/res/values/styles.xml
+++ b/lib/res/values/styles.xml
@@ -24,6 +24,7 @@
     <item name="pressedTranslationZ">@dimen/design_fab_translation_z_pressed</item>
     <item name="rippleColor">?attr/colorControlHighlight</item>
     <item name="borderWidth">@dimen/design_fab_border_width</item>
+    <item name="maxImageSize">@dimen/design_fab_image_size</item>
   </style>
 
   <style name="Widget.Design.ScrimInsetsFrameLayout" parent="">
diff --git a/lib/src/android/support/design/widget/FloatingActionButton.java b/lib/src/android/support/design/widget/FloatingActionButton.java
index 7f1169a2b..9704b602b 100644
--- a/lib/src/android/support/design/widget/FloatingActionButton.java
+++ b/lib/src/android/support/design/widget/FloatingActionButton.java
@@ -177,6 +177,7 @@ public class FloatingActionButton extends VisibilityAwareImageButton
     final float pressedTranslationZ =
         a.getDimension(R.styleable.FloatingActionButton_pressedTranslationZ, 0f);
     mCompatPadding = a.getBoolean(R.styleable.FloatingActionButton_useCompatPadding, false);
+    mMaxImageSize = a.getDimensionPixelSize(R.styleable.FloatingActionButton_maxImageSize, 0);
     a.recycle();
 
     mImageHelper = new AppCompatImageHelper(this);
@@ -184,8 +185,6 @@ public class FloatingActionButton extends VisibilityAwareImageButton
 
     expandableWidgetHelper = new ExpandableWidgetHelper(this);
 
-    mMaxImageSize = (int) getResources().getDimension(R.dimen.design_fab_image_size);
-
     getImpl()
         .setBackgroundDrawable(mBackgroundTint, mBackgroundTintMode, mRippleColor, mBorderWidth);
     getImpl().setElevation(elevation);