DEV/material-components_material-components-android
1
0
Fork 0
mirror of https://github.com/material-components/material-components-android.git synced 2026-02-20 08:39:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

am 0004b7b2: am ff19191e: Merge "Make FloatingActionButton focusable" into mnc-ub-dev

Browse Source 
* commit '0004b7b2cabf2937f3056e83a4686f10cb5041f4':
  Make FloatingActionButton focusable

GitOrigin-RevId=20d467e20a3ba8e6fca0769d88c619b8944c284e

PiperOrigin-RevId: 140549567
This commit is contained in:
Chris Banes 2016-11-30 01:26:50 +00:00 committed by Travis Collins
parent d647bf661d
commit 78b0d0b103
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@ -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);

3
src/android/support/design/widget/FloatingActionButton.java
View File

@ -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;