New material things

2014-10-25 14:35:31 +02:00
parent 4d26fa7f3d
commit 78407c292a
164 changed files with 1485 additions and 1607 deletions
--- a/libraries/FloatingActionButton/src/com/faizmalkani/floatingactionbutton/FloatingActionButton.java
+++ b/libraries/FloatingActionButton/src/com/faizmalkani/floatingactionbutton/FloatingActionButton.java
@@ -52,7 +52,7 @@ public class FloatingActionButton extends View {
        super(context, attrs, defStyleAttr);

        TypedArray a = getContext().obtainStyledAttributes(attrs, R.styleable.FloatingActionButton);
-        mColor = a.getColor(R.styleable.FloatingActionButton_color, Color.WHITE);
+        mColor = a.getColor(R.styleable.FloatingActionButton_colour, Color.WHITE);
        mButtonPaint.setStyle(Paint.Style.FILL);
        mButtonPaint.setColor(mColor);
        float radius, dx, dy;