summaryrefslogtreecommitdiff
path: root/app/src/main/java
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2015-06-16 11:19:56 +0200
committerParménides GV <parmegv@sdf.org>2015-06-16 11:19:56 +0200
commited2256ef0ef71fb9e1a35c2328a467d423f588ad (patch)
tree4d2e9b05d4b1157fc2ce1cd2cb6f083d98555e97 /app/src/main/java
parentf5f2e7706867d7a0d45b139c18e64e0bfc96ffae (diff)
parent4bf4f2e08e1da24227b538c2e8e2a22e01cd84a6 (diff)
Merge branch 'feature/Put-an-icon-in-the-user-status-FabButton-#6923' into develop
Diffstat (limited to 'app/src/main/java')
-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);
}