From 78b0d0b103274f47fbd298b03dda4e0147da057c Mon Sep 17 00:00:00 2001
From: Chris Banes <chrisbanes@google.com>
Date: Wed, 30 Nov 2016 01:26:50 +0000
Subject: [PATCH] am 0004b7b2: am ff19191e: Merge "Make FloatingActionButton
 focusable" into mnc-ub-dev

* commit '0004b7b2cabf2937f3056e83a4686f10cb5041f4':
  Make FloatingActionButton focusable

GitOrigin-RevId=20d467e20a3ba8e6fca0769d88c619b8944c284e

PiperOrigin-RevId: 140549567
---
 api/current.txt                                             | 2 +-
 src/android/support/design/widget/FloatingActionButton.java | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/api/current.txt b/api/current.txt
index de4e09b1d..e8a1f33fb 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -178,7 +178,7 @@ package android.support.design.widget {
     field public static final android.os.Parcelable.Creator<android.support.design.widget.CoordinatorLayout.SavedState> CREATOR;
   }
 
-  public class FloatingActionButton extends android.widget.ImageView {
+  public class FloatingActionButton extends android.widget.ImageButton {
     ctor public FloatingActionButton(android.content.Context);
     ctor public FloatingActionButton(android.content.Context, android.util.AttributeSet);
     ctor public FloatingActionButton(android.content.Context, android.util.AttributeSet, int);
diff --git a/src/android/support/design/widget/FloatingActionButton.java b/src/android/support/design/widget/FloatingActionButton.java
index 9240f1223..fda99852c 100644
--- a/src/android/support/design/widget/FloatingActionButton.java
+++ b/src/android/support/design/widget/FloatingActionButton.java
@@ -31,6 +31,7 @@ import android.support.design.R;
 import android.support.v4.view.ViewCompat;
 import android.util.AttributeSet;
 import android.view.View;
+import android.widget.ImageButton;
 import android.widget.ImageView;
 
 import java.util.List;
@@ -53,7 +54,7 @@ import java.util.List;
  * @attr ref android.support.design.R.styleable#FloatingActionButton_fabSize
  */
 @CoordinatorLayout.DefaultBehavior(FloatingActionButton.Behavior.class)
-public class FloatingActionButton extends ImageView {
+public class FloatingActionButton extends ImageButton {
 
     // These values must match those in the attrs declaration
     private static final int SIZE_MINI = 1;