summaryrefslogtreecommitdiff
path: root/app/src/main/java/se/leap
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2015-06-16 11:21:07 +0200
committerParménides GV <parmegv@sdf.org>2015-06-16 11:21:07 +0200
commitbdbd8b264eb4f82b9d87dc9bf3d05641a96a19f2 (patch)
treeab21e0f2c13b2f9b7a2a5866b79f3a9b5c548cec /app/src/main/java/se/leap
parentfe1b2fd32d93bbe0bd7d884cd903e7955f770c33 (diff)
parented2256ef0ef71fb9e1a35c2328a467d423f588ad (diff)
Merge branch 'develop' into release-0.9.4
Diffstat (limited to 'app/src/main/java/se/leap')
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/userstatus/FabButton.java6
1 files changed, 0 insertions, 6 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/userstatus/FabButton.java b/app/src/main/java/se/leap/bitmaskclient/userstatus/FabButton.java
index 1bf1847c..d1c56dee 100644
--- a/app/src/main/java/se/leap/bitmaskclient/userstatus/FabButton.java
+++ b/app/src/main/java/se/leap/bitmaskclient/userstatus/FabButton.java
@@ -22,12 +22,6 @@ public class FabButton extends mbanje.kurt.fabbutton.FabButton {
super(context, attrs, defStyle);
}
- @Override
- protected void init(Context context, AttributeSet attrs, int defStyle) {
- super.init(context, attrs, defStyle);
- super.init(context, attrs, defStyle);
- }
-
private CircleImageView getImage() {
return (CircleImageView) findViewById(R.id.fabbutton_circle);
}