commit 1f054febf6dc91e7c8d9f61500e498af8582f8b4
author Chris Banes <chrisbanes@google.com> Fri Apr 17 10:44:14 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Apr 17 10:44:14 2015 +0000
tree 213921d098f5fcdf5e0feb981198fe099d1df425
parent bc7c83dae47167dd7cf89f2d4f4edd60223ed758
parent de373c43e108bc24b46c947c7a4da26774cdb874

am de373c43: am 1ef42f18: am 29611577: Merge "FAB: Fix NPE with XML attribute, set clickable by default"

* commit 'de373c43e108bc24b46c947c7a4da26774cdb874':
  FAB: Fix NPE with XML attribute, set clickable by default

design/src/android/support/design/widget/FloatingActionButton.java

diff --git a/design/src/android/support/design/widget/FloatingActionButton.java b/design/src/android/support/design/widget/FloatingActionButton.java
index caa3509..742bfa1 100644
--- a/design/src/android/support/design/widget/FloatingActionButton.java
+++ b/design/src/android/support/design/widget/FloatingActionButton.java
@@ -122,6 +122,8 @@
                 mBackgroundTintMode, mRippleColor);
         mImpl.setElevation(elevation);
         mImpl.setPressedTranslationZ(pressedTranslationZ);
+
+        setClickable(true);
     }
 
     @Override
@@ -206,7 +208,10 @@
 
     @Override
     public void setBackgroundDrawable(Drawable background) {
-        mImpl.setBackgroundDrawable(background, mBackgroundTint, mBackgroundTintMode, mRippleColor);
+        if (mImpl != null) {
+            mImpl.setBackgroundDrawable(
+                background, mBackgroundTint, mBackgroundTintMode, mRippleColor);
+        }
     }
 
     final int getSizeDimension() {